From 758790e7e47ad9251c808d18ed4e1fb50cff7980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 21 Apr 2016 17:17:53 +0200 Subject: [PATCH] Fix address layout for country Country should be alone on the last line and in capital letter. issue5494 review22961002 --- address.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/address.py b/address.py index 3c393d7d2c..dfbcd1064b 100644 --- a/address.py +++ b/address.py @@ -125,15 +125,14 @@ class Address(ModelSQL, ModelView): if full_address[-1:] != '\n': full_address += ' ' full_address += self.city - if self.country or self.subdivision: + if self.subdivision: if full_address: full_address += '\n' - if self.subdivision: - full_address += self.subdivision.name - if self.country: - if full_address[-1:] != '\n': - full_address += ' ' - full_address += self.country.name + full_address += self.subdivision.name + if self.country: + if full_address: + full_address += '\n' + full_address += self.country.name.upper() return full_address def get_rec_name(self, name):