From fba234741b1de5be71cfb5673b5693e0a4d667bd Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 30 May 2017 17:58:05 +0200 Subject: [PATCH] [IMP] base: Move default address format into a method for inheritence This diff is a small refactoring of a method to allow override. --- odoo/addons/base/res/res_partner.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/odoo/addons/base/res/res_partner.py b/odoo/addons/base/res/res_partner.py index 18e76a4a46c..10db1ddfe67 100644 --- a/odoo/addons/base/res/res_partner.py +++ b/odoo/addons/base/res/res_partner.py @@ -764,6 +764,10 @@ class Partner(models.Model): ''' Return the main partner ''' return self.env.ref('base.main_partner') + @api.model + def _get_default_address_format(self): + return "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s" + @api.multi def _display_address(self, without_company=False): @@ -779,7 +783,7 @@ class Partner(models.Model): # get the information that will be injected into the display format # get the address format address_format = self.country_id.address_format or \ - "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s" + self._get_default_address_format() args = { 'state_code': self.state_id.code or '', 'state_name': self.state_id.name or '',