openerp-community-reviewer team mailing list archive

[Pedro Manuel Baeza <pedro.baeza@xxxxxxxxx>]

Pedro Manuel Baeza has proposed merging lp:~pedro.baeza/partner-contact-management/7.0-base_location-imp into lp:partner-contact-management.

Requested reviews:
  Partner and Contact Core Editors (partner-contact-core-editors)

For more details, see:
https://code.launchpad.net/~pedro.baeza/partner-contact-management/7.0-base_location-imp/+merge/198840

As discussed here: https://code.launchpad.net/~savoirfairelinux-openerp/partner-contact-management/city-move/+merge/196023, this is a proposal to join the requirements from Vauxoo and Savoir-Faire Linux with current base_location implementation. The only difference is to have it the ZIp ('name' field) not required.
-- 
https://code.launchpad.net/~pedro.baeza/partner-contact-management/7.0-base_location-imp/+merge/198840
Your team Partner and Contact Core Editors is requested to review the proposed merge of lp:~pedro.baeza/partner-contact-management/7.0-base_location-imp into lp:partner-contact-management.

=== modified file 'base_location/better_zip.py'
--- base_location/better_zip.py	2013-07-09 08:03:15 +0000
+++ base_location/better_zip.py	2013-12-12 22:39:07 +0000
@@ -30,7 +30,7 @@
     _order = "priority"
 
     _columns = {'priority': fields.integer('Priority', deprecated=True),
-                'name': fields.char('ZIP', required=True),
+                'name': fields.char('ZIP'),
                 'city': fields.char('City', required=True),
                 'state_id': fields.many2one('res.country.state', 'State'),
                 'country_id': fields.many2one('res.country', 'Country'),
@@ -43,7 +43,10 @@
     def name_get(self, cursor, uid, ids, context=None):
         res = []
         for bzip in self.browse(cursor, uid, ids):
-            name = [bzip.name, bzip.city]
+            if bzip.name:
+                name = [bzip.name, bzip.city]
+            else:
+                name = [bzip.city]
             if bzip.state_id:
                 name.append(bzip.state_id.name)
             if bzip.country_id:

=== modified file 'base_location/better_zip_view.xml'
--- base_location/better_zip_view.xml	2013-06-24 07:56:39 +0000
+++ base_location/better_zip_view.xml	2013-12-12 22:39:07 +0000
@@ -33,12 +33,24 @@
       </field>
     </record>
 
+    <record id="view_better_zip_filter" model="ir.ui.view">
+      <field name="name">res.better.zip.select</field>
+        <field name="model">res.better.zip</field>
+        <field name="arch" type="xml">
+        <search string="Search city">
+          <field name="name"/>
+          <field name="city"/>
+        </search>
+      </field>
+    </record>
+
     <record id="action_zip_tree" model="ir.actions.act_window">
       <field name="name">Cites/locations Management</field>
       <field name="res_model">res.better.zip</field>
       <field name="view_type">form</field>
       <field name="view_mode">tree,form</field>
       <field ref="better_zip_tree" name="view_id"/>
+      <field name="search_view_id" ref="view_better_zip_filter"/>
     </record>
 
     <menuitem

=== modified file 'base_location/i18n/base_location.pot'
--- base_location/i18n/base_location.pot	2013-06-25 08:57:02 +0000
+++ base_location/i18n/base_location.pot	2013-12-12 22:39:07 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-25 08:56+0000\n"
-"PO-Revision-Date: 2013-06-25 08:56+0000\n"
+"POT-Creation-Date: 2013-12-12 22:33+0000\n"
+"PO-Revision-Date: 2013-12-12 22:33+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -32,6 +32,11 @@
 msgstr ""
 
 #. module: base_location
+#: field:res.better.zip,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: base_location
 #: field:res.better.zip,country_id:0
 msgid "Country"
 msgstr ""
@@ -67,8 +72,8 @@
 msgstr ""
 
 #. module: base_location
-#: field:res.better.zip,state_id:0
-msgid "State"
+#: view:res.better.zip:0
+msgid "Search city"
 msgstr ""
 
 #. module: base_location

=== modified file 'base_location/i18n/es.po'
--- base_location/i18n/es.po	2013-06-25 08:57:02 +0000
+++ base_location/i18n/es.po	2013-12-12 22:39:07 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-25 08:47+0000\n"
-"PO-Revision-Date: 2013-06-25 10:47+0100\n"
+"POT-Creation-Date: 2013-12-12 22:34+0000\n"
+"PO-Revision-Date: 2013-12-12 23:34+0100\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@xxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -32,6 +32,11 @@
 msgstr "C.P."
 
 #. module: base_location
+#: field:res.better.zip,state_id:0
+msgid "State"
+msgstr "Provincia"
+
+#. module: base_location
 #: field:res.better.zip,country_id:0
 msgid "Country"
 msgstr "País"
@@ -67,9 +72,9 @@
 msgstr "Ciudad/Ubicación"
 
 #. module: base_location
-#: field:res.better.zip,state_id:0
-msgid "State"
-msgstr "Provincia"
+#: view:res.better.zip:0
+msgid "Search city"
+msgstr "Buscar ciudad"
 
 #. module: base_location
 #: field:res.company,better_zip_id:0