Merge PR #519 into 10.0

Signed-off-by NL66278

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):
@@ -17,3 +17,11 @@ 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)
+        res = re.sub(r'\n{2,}', r'\n', res)
+        return res