From 49cdf3aeeab23b038cafb6c9f6d6d56e25b8dd73 Mon Sep 17 00:00:00 2001
From: Juan Jose Scarafia <scarafia.juanjose@gmail.com>
Date: Thu, 26 Mar 2015 08:49:11 -0300
Subject: [PATCH] FIX Use old name_get method to compute display_name field

---
 base_location/models/better_zip.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/base_location/models/better_zip.py b/base_location/models/better_zip.py
index 4c0204da7..7790d9ff7 100644
--- a/base_location/models/better_zip.py
+++ b/base_location/models/better_zip.py
@@ -46,12 +46,15 @@ class BetterZip(models.Model):
         'country_id',
         )
     def _get_display_name(self):
-        self.display_name = ('(%s) %s, %s, %s') % (
-            self.name or '',
-            self.city or '',
-            self.state_id and self.state_id.name or '',
-            self.country_id and self.country_id.name or '',
-            )
+        if self.name:
+            name = [self.name, self.city]
+        else:
+            name = [self.city]
+        if self.state_id:
+            name.append(self.state_id.name)
+        if self.country_id:
+            name.append(self.country_id.name)
+        self.display_name = ", ".join(name)
 
     @api.onchange('state_id')
     def onchange_state_id(self):