[IMP] base: Move default address format into a method for inheritence

This diff is a small refactoring of a method to allow override.
This commit is contained in:
Yannick Tivisse
2017-05-30 17:59:31 +02:00
parent ef17f92c9f
commit fba234741b
+5 -1
View File
@@ -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 '',