diff options
| author | jbm-odoo <jbm@odoo.com> | 2019-08-14 08:42:51 +0000 |
|---|---|---|
| committer | jbm-odoo <jbm@odoo.com> | 2019-08-14 08:42:51 +0000 |
| commit | 839696d2d7dd574fd8958d17726379926e94d590 (patch) | |
| tree | 327918aa9537882e6a4663c8d3c7de5faa3ce48c /addons/base_setup/models | |
| parent | 1dac1faaff8fbde16f155887db2fba921450d9c6 (diff) | |
[IMP] settings: Fix Improve general UX (back2basics)
closes odoo/odoo#35710
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/base_setup/models')
| -rw-r--r-- | addons/base_setup/models/res_config_settings.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py index d84c8ef79b3..6785ecae9d8 100644 --- a/addons/base_setup/models/res_config_settings.py +++ b/addons/base_setup/models/res_config_settings.py @@ -119,7 +119,9 @@ class ResConfigSettings(models.TransientModel): informations = '%s\n' % self.company_id.street if self.company_id.street else '' informations += '%s\n' % self.company_id.street2 if self.company_id.street2 else '' informations += '%s' % self.company_id.zip if self.company_id.zip else '' - informations += ' - %s\n' % self.company_id.city if self.company_id.city else '\n' + informations += '\n' if self.company_id.zip and not self.company_id.city else '' + informations += ' - ' if self.company_id.zip and self.company_id.city else '' + informations += '%s\n' % self.company_id.city if self.company_id.city else '' informations += '%s\n' % self.company_id.state_id.display_name if self.company_id.state_id else '' informations += '%s' % self.company_id.country_id.display_name if self.company_id.country_id else '' informations += '\nVAT: %s' % self.company_id.vat if self.company_id.vat else '' |