From c431039aa91671fa79bb6190031fe0f3e540704b Mon Sep 17 00:00:00 2001 From: "Giang, Thai Nguyen Minh" Date: Thu, 16 Nov 2017 11:03:56 +0700 Subject: [PATCH 1/4] [10.0][FIX] Fix the module adding the street3 --- partner_address_street3/model/partner.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/partner_address_street3/model/partner.py b/partner_address_street3/model/partner.py index a12490ed803c..1d14de311cfc 100644 --- a/partner_address_street3/model/partner.py +++ b/partner_address_street3/model/partner.py @@ -17,3 +17,12 @@ def _address_fields(self): fields = super(ResPartner, self)._address_fields() fields.append('street3') return fields + + @api.multi + def _display_address(self, without_company=False): + """Remove empty lines which can happen when street3 field is empty.""" + res = super(ResPartner, self)._display_address(\ + without_company=without_company) + while '\n\n' in res: + res = res.replace('\n\n', '\n') + return res From a6c0b5eb2a85e8ecc3c36f0a184d27558185db8a Mon Sep 17 00:00:00 2001 From: "Giang, Thai Nguyen Minh" Date: Thu, 16 Nov 2017 11:41:34 +0700 Subject: [PATCH 2/4] [10.0][FIX] Fix the module adding the street3 --- partner_address_street3/model/partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/partner_address_street3/model/partner.py b/partner_address_street3/model/partner.py index 1d14de311cfc..8a3f975644a0 100644 --- a/partner_address_street3/model/partner.py +++ b/partner_address_street3/model/partner.py @@ -21,7 +21,7 @@ def _address_fields(self): @api.multi def _display_address(self, without_company=False): """Remove empty lines which can happen when street3 field is empty.""" - res = super(ResPartner, self)._display_address(\ + res = super(ResPartner, self)._display_address( without_company=without_company) while '\n\n' in res: res = res.replace('\n\n', '\n') From 4ab15687211c96f2f5527200b52077c1f312d041 Mon Sep 17 00:00:00 2001 From: "Giang, Thai Nguyen Minh" Date: Wed, 29 Nov 2017 11:03:40 +0700 Subject: [PATCH 3/4] [10.0][FIX] Fix the module adding the street3 --- partner_address_street3/model/partner.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/partner_address_street3/model/partner.py b/partner_address_street3/model/partner.py index 8a3f975644a0..26aa1da95fad 100644 --- a/partner_address_street3/model/partner.py +++ b/partner_address_street3/model/partner.py @@ -2,8 +2,8 @@ # © 2014-2016 Camptocamp SA # @author: Nicolas Bessi # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import models, fields, api +import re +from odoo import api, fields, models class ResPartner(models.Model): @@ -23,6 +23,5 @@ def _display_address(self, without_company=False): """Remove empty lines which can happen when street3 field is empty.""" res = super(ResPartner, self)._display_address( without_company=without_company) - while '\n\n' in res: - res = res.replace('\n\n', '\n') + res = re.sub(r'([\n]+)', r'\n', res) return res From 15af0fa42dd24929e8f0c6e191481b73ce5af8c6 Mon Sep 17 00:00:00 2001 From: "Giang, Thai Nguyen Minh" <32560539+giangtnm@users.noreply.github.com> Date: Thu, 30 Nov 2017 19:28:24 +0700 Subject: [PATCH 4/4] T#745 - Fix the module adding the street3 --- partner_address_street3/model/partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/partner_address_street3/model/partner.py b/partner_address_street3/model/partner.py index 26aa1da95fad..81e38ac989c4 100644 --- a/partner_address_street3/model/partner.py +++ b/partner_address_street3/model/partner.py @@ -23,5 +23,5 @@ def _display_address(self, without_company=False): """Remove empty lines which can happen when street3 field is empty.""" res = super(ResPartner, self)._display_address( without_company=without_company) - res = re.sub(r'([\n]+)', r'\n', res) + res = re.sub(r'\n{2,}', r'\n', res) return res