diff --git a/base_company_extension/__manifest__.py b/base_company_extension/__manifest__.py index 9c9887b..55d82fe 100644 --- a/base_company_extension/__manifest__.py +++ b/base_company_extension/__manifest__.py @@ -21,7 +21,8 @@ This module adds 2 fields on the Company : """, 'author': 'Akretion', 'website': 'http://www.akretion.com', - 'depends': ['base'], + # I depend on base_usability only for _report_company_legal_name() + 'depends': ['base_usability'], 'data': ['company_view.xml'], 'installable': True, } diff --git a/base_company_extension/company.py b/base_company_extension/company.py index 72bf3f6..46663c6 100644 --- a/base_company_extension/company.py +++ b/base_company_extension/company.py @@ -14,6 +14,14 @@ class ResCompany(models.Model): legal_type = fields.Char( string="Legal Type", help="Type of Company, e.g. SARL, SAS, ...") + def _report_company_legal_name(self): + self.ensure_one() + if self.legal_type: + name = u'%s %s' % (self.name, self.legal_type) + else: + name = self.name + return name + _sql_constraints = [( 'capital_amount_positive', 'CHECK (capital_amount >= 0)', diff --git a/base_usability/company.py b/base_usability/company.py index 2cb4206..dfe6e15 100644 --- a/base_usability/company.py +++ b/base_usability/company.py @@ -61,6 +61,11 @@ class ResCompany(models.Model): } return options + def _report_company_legal_name(self): + '''Method inherited in the module base_company_extension''' + self.ensure_one() + return self.name + # for reports @api.multi def _display_report_header( @@ -70,7 +75,8 @@ class ResCompany(models.Model): res = u'' address = self.partner_id._display_address(without_company=True) address = address.replace('\n', u' - ') - line1 = u'%s - %s' % (self.name, address) + + line1 = u'%s - %s' % (self._report_company_legal_name(), address) lines = [line1] options = self._prepare_header_options() for details in line_details: