Merge lp:~camptocamp/partner-contact-management/city_into_better_zip into lp:~partner-contact-core-editors/partner-contact-management/7.0

[Nicolas Bessi - Camptocamp]

Porting city addons into better zip:
  -More complexe name get and name search.
  -Completion of country when changing state.
  -Zip object is added on company.
  -One2many from state to zip
  -Security is CSV

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Still need to do po files

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Add PO files. Pedro can you have a look at spanish translation please.

Regards

Nicolas

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Nicolas,

Thanks for the work. These are my comments to your MP:

- 'ZIP Management' must be inside Configuration > Address book > Localization for better organization.
- 'ZIP Management' and 'ZIP completion' may not reflect the exact meaning of the function, because the completion is not only for the ZIP, but for the city, state and state fields. Why don't use 'Cities' and 'Location'?
- Please separate elements with commas instead spaces in name_get method of 'res.better.zip' for better understanding (specially with compound names).
- For what is used priority field? I think that now it's not necessary, doesn't it?

About the contributions lines, please change my email to the commercial one (<email address hidden>) and include also Ignacio Ibeas (<email address hidden>), that has contributed to the new city module.

When we decide all these things (and maybe the eventual module name change), I'll make the translation to spanish. We can also publish a pot file to let Launchpad manage translations.

Regards.

review: Needs Fixing

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

Il will do the changes.
The priority fields is used to manage different location with same zip.
For example 1000 Lausanne (usual case) and 1000 Lausanne Caserne (military ZIP)
Priority will ensure order when searching

Regards

Nicolas

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Nicolas:

That is why I say you don't need it, because when you search by zip code, all ocurrences will appear (or at least first 5) in the combo box, and you also have the ability to search by city name, so priority is now useless.

Cheers.

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

OK then I will flag it as deprecated.

Regards

Nicolas

Le Mon May 13 13:34:27 2013, Pedro Manuel Baeza a écrit :
> Hi, Nicolas:
>
> That is why I say you don't need it, because when you search by zip code, all ocurrences will appear (or at least first 5) in the combo box, and you also have the ability to search by city name, so priority is now useless.
>
> Cheers.

--
Nicolas Bessi
Senior ERP consultant
Business Solution technical manager

Camptocamp SA
PSE A
CH-1015 Lausanne
http://openerp.camptocamp.com

Phone: [phone]
Office: [phone]
Fax : [phone]
--

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Nicolas, can you made any update on this MP?

Regards.

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

I have pushed the last modifications

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Nicolas,

Thank you very much for your effort. Two more things to close this MP:

* Can you please put Cities/Location Management inside Location instead in Addres book for better organization?
* What do you think about the renaming to base_location to better express the funcionality?

Thanks again.

Regards.

review: Needs Fixing

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

Wich location menu are you talking about? Can you please give me the full path or better the parent id.

I'm a little afraid that renaming the addon breaks depending addons. I will make a test with a symlink and see if it works.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

I agree with Pedro, the menu Address Book/Localization already contains Country so Cities should be there.

Here is the menu id:

addons/base/res/res_country_view.xml
47: <menuitem id="menu_localisation" name="Localization" parent="menu_config_address_book" sequence="1" groups="base.group_no_one"/>

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Ah Yannick get the point "localization" not "Location".
It's ok for me.
Perdo can you confirm?

Regards

Nicolas

[Pedro Manuel Baeza (pedro.baeza)]

Sorry, this was my mistake. Localization is correct instead of Location.

Regards.

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Ok then I will propose final fixes tomorrow.

Regards

Nicolas

[lp:~camptocamp/partner-contact-management/city_into_better_zip]

29. By Nicolas Bessi - Camptocamp on 2013-06-24

[FIX] change config. menu path

30. By Nicolas Bessi - Camptocamp on 2013-06-25

[MV] rename better_zip to base_location

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello I have done the last fixes and rename the addons. I have also added a symlink named better_zip to base_location. It makes the addons appears two times but if you have technical feature permission it should not be a problem distinguish them. I also not sure of bzr symlink behavior on older version of Windows.

Regards

Nicolas

[lp:~camptocamp/partner-contact-management/city_into_better_zip]

31. By Nicolas Bessi - Camptocamp on 2013-06-25

[ADD] better_zip simlink for compatibility

32. By Pedro Manuel Baeza on 2013-06-25

base_location: [IMP] Spanish translation and translation template.

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Nicolas, thank you so much for your effort. You have done a wonderful work! Now the module is perfect and I'm going to use it as base of l10n_es_toponyms. Thanks also to other people that has helped in review, comments, and so on.

I have made an MP to your branch to integrate spanish translation, so please merge it and when you want, we merge also this proposal to partner-contact-management.

Regards.

review: Approve

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Hello Nicolas and Pedro,

I'm, sorry here we made big refactors around wip management in the Brazilian localization but ended loosing the train for v7 for using the city module. I'll have a look at your refactor though to see if it will work for us too and hopefully we catch up with the a standard city model and base zip model for v8. Thank you very much for your work.

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Nicolas, can you please merge my branch with spanish translation and merge this MP to complete it?

Thank you!

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello

better_zip/base_location is ready for final review

[Pedro Manuel Baeza (pedro.baeza)]

¡¡Perfect!! You can proceed with the merge when you want.

review: Approve

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

Can someone merge this one.

[Stefan Rijnhart (Opener) (stefan-opener)]

Great to see this examplary collaboration! Noticed this proposal could do with another review, so just a few nits:

- l.133 should have context=None, not context={}
- l.148 is it wise to have the operator hardcoded?
- l.247,l.773 e.a. maybe use the conventional 'cr', not 'cursor'
- l.250 pass context

review: Needs Fixing

[lp:~camptocamp/partner-contact-management/city_into_better_zip]

33. By Nicolas Bessi - Camptocamp on 2013-07-09

[FIX] mutable default in function signature

34. By Nicolas Bessi - Camptocamp on 2013-07-09

[FIX] pass context to default get

35. By Nicolas Bessi - Camptocamp on 2013-07-09

[FIX] variable name cursor -> cr

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Just commited fixes.

For the operator I propose to let it be like this for now it preserves previous behavior.

Regards

Nicolas

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for your changes!

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

Thanks Stefan for your code fine tuning!!

=== renamed directory 'better_zip' => 'base_location'
=== modified file 'base_location/__init__.py'
--- better_zip/__init__.py	2013-01-18 08:21:59 +0000
+++ base_location/__init__.py	2013-07-09 08:10:36 +0000
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author Nicolas Bessi. Copyright Camptocamp SA
+#    Author: Nicolas Bessi. Copyright Camptocamp SA
+#    Contributor: Pedro Manuel Baeza <[e-mail]>
+#                 Ignacio Ibeas <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,3 +20,6 @@
 #
 ##############################################################################
 from . import better_zip
+from . import partner
+from . import state
+from . import company

=== modified file 'base_location/__openerp__.py'
--- better_zip/__openerp__.py	2013-01-17 13:26:22 +0000
+++ base_location/__openerp__.py	2013-07-09 08:10:36 +0000
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author Nicolas Bessi. Copyright Camptocamp SA
+#    Author: Nicolas Bessi. Copyright Camptocamp SA
+#    Contributor: Pedro Manuel Baeza <[e-mail]>
+#                 Ignacio Ibeas <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -17,13 +19,19 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{'name': 'Better zip management',
+{'name': 'Location management (aka Better ZIP)',
  'version': '0.3',
- 'depends': ['base',],
+ 'depends': ['base'],
  'author': 'Camptocamp',
- 'description': """Introduce a better zip/npa management system. Enable partner completion""",
+ 'description': """
+Introduces a better zip/npa management system.
+It enables zip/city auto-completion on partners""",
  'website': 'http://www.camptocamp.com',
- 'data': ['security/security.xml', 'better_zip_view.xml'],
+ 'data': ['better_zip_view.xml',
+          'state_view.xml',
+          'company_view.xml',
+          'partner_view.xml',
+          'security/ir.model.access.csv'],
  'installable': True,
  'active': False,
  }

=== modified file 'base_location/better_zip.py'
--- better_zip/better_zip.py	2013-01-18 08:21:59 +0000
+++ base_location/better_zip.py	2013-07-09 08:10:36 +0000
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author Nicolas Bessi. Copyright Camptocamp SA
+#    Author: Nicolas Bessi. Copyright Camptocamp SA
+#    Contributor: Pedro Manuel Baeza <[e-mail]>
+#                 Ignacio Ibeas <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -17,21 +19,23 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv.orm import Model, fields
-
-
-class BetterZip(Model):
-    " Zip/NPA object"
+from openerp.osv import orm, fields
+
+
+class BetterZip(orm.Model):
+    " City/locations completion object"
 
     _name = "res.better.zip"
     _description = __doc__
     _order = "priority"
 
-    _columns = {'priority': fields.integer('Priority'),
+    _columns = {'priority': fields.integer('Priority', deprecated=True),
                 'name': fields.char('ZIP', required=True),
                 'city': fields.char('City', required=True),
                 'state_id': fields.many2one('res.country.state', 'State'),
                 'country_id': fields.many2one('res.country', 'Country'),
+                'code': fields.char('City Code', size=64,
+                                    help="The official code for the city"),
                 }
 
     _defaults = {'priority': 100}
@@ -39,19 +43,30 @@
     def name_get(self, cursor, uid, ids, context=None):
         res = []
         for bzip in self.browse(cursor, uid, ids):
-            res.append((bzip.id, u"%s %s" % (bzip.name, bzip.city)))
+            name = [bzip.name, bzip.city]
+            if bzip.state_id:
+                name.append(bzip.state_id.name)
+            if bzip.country_id:
+                name.append(bzip.country_id.name)
+            res.append((bzip.id, ", ".join(name)))
         return res
 
-
-class Partner(Model):
-    _inherit = "res.partner"
-    _columns = {'zip_id': fields.many2one('res.better.zip', 'ZIP/PN')}
-
-    def onchange_zip_id(self, cursor, uid, ids, zip_id, context=None):
-        if not zip_id:
-            return {}
-        if isinstance(zip_id, list):
-            zip_id = zip_id[0]
-        bzip = self.pool['res.better.zip'].browse(cursor, uid, zip_id, context=context)
-        return {'value': {'zip': bzip.name, 'city': bzip.city,
-                          'country_id': bzip.country_id.id, 'state_id': bzip.state_id.id}}
+    def onchange_state_id(self, cr, uid, ids, state_id=False, context=None):
+        result = {}
+        if state_id:
+            state = self.pool['res.country.state'].browse(cr, uid, state_id, context=context)
+            if state:
+                result['value'] = {'country_id': state.country_id.id}
+        return result
+
+    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
+        if args is None:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if name:
+            ids = self.search(cr, uid, [('name', 'ilike', name)] + args, limit=limit)
+        if not ids:
+            ids = self.search(cr, uid, [('city', operator, name)] + args, limit=limit)
+        return self.name_get(cr, uid, ids, context=context)

=== modified file 'base_location/better_zip_view.xml'
--- better_zip/better_zip_view.xml	2013-01-16 15:15:15 +0000
+++ base_location/better_zip_view.xml	2013-07-09 08:10:36 +0000
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
   <data>
-    <record id="view_partner_form" model="ir.ui.view">
-      <field name="name">res.partner.zip_id.2</field>
-      <field name="model">res.partner</field>
-      <field name="inherit_id" ref="base.view_partner_form"/>
-      <field name="arch" type="xml">
-        <field name="city" position="before">
-            <field name="zip_id" on_change="onchange_zip_id(zip_id)" placeholder="ZIP completion"/>
-        </field>
-      </field>
-    </record>
 
     <record model="ir.ui.view" id="better_zip_form">
       <field name="name">res.better.zip.form</field>
@@ -19,9 +9,10 @@
         <form string="ZIP" version="7.0">
           <group col="4">
             <field name="name"/>
+            <field name="code"/>
             <field name="city"/>
             <field name="priority"/>
-            <field name="state_id"/>
+            <field name="state_id" on_change="onchange_state_id(state_id)"/>
             <field name="country_id"/>
           </group>
         </form>
@@ -34,6 +25,7 @@
       <field name="arch" type="xml">
         <tree string="ZIP">
           <field name="name"/>
+          <field name="code"/>
           <field name="city"/>
           <field name="country_id"/>
           <field name="priority"/>
@@ -42,7 +34,7 @@
     </record>
 
     <record id="action_zip_tree" model="ir.actions.act_window">
-      <field name="name">ZIP Management</field>
+      <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>
@@ -50,9 +42,9 @@
     </record>
 
     <menuitem
-        name="ZIP Management"
+        name="Cities/Locations Management"
         id="zip_base"
-        parent="base.menu_base_config"
+        parent="base.menu_localisation"
         action="action_zip_tree"
         />
   </data>

=== added file 'base_location/company.py'
--- base_location/company.py	1970-01-01 00:00:00 +0000
+++ base_location/company.py	2013-07-09 08:10:36 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi. Copyright Camptocamp SA
+#    Contributor: Pedro Manuel Baeza <[e-mail]>
+#                 Ignacio Ibeas <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import orm, fields
+
+
+class ResCompany(orm.Model):
+
+    _inherit = 'res.company'
+
+    def on_change_city(self, cr, uid, ids, zip_id, context=None):
+        result = {}
+        if context is None:
+            context = {}
+        if zip_id:
+            bzip = self.pool['res.better.zip'].browse(cr, uid, zip_id, context=context)
+            result = {'value': {'zip': bzip.name,
+                                'country_id': bzip.country_id.id if bzip.country_id else False,
+                                'city': bzip.city,
+                                'state_id': bzip.state_id.id if bzip.state_id else False
+                                }
+                      }
+        return result
+
+    _columns = {
+        'better_zip_id': fields.many2one('res.better.zip', 'Location', select=1,
+                                         help=('Use the city name or the zip code'
+                                         ' to search the location')),
+    }

=== added file 'base_location/company_view.xml'
--- base_location/company_view.xml	1970-01-01 00:00:00 +0000
+++ base_location/company_view.xml	2013-07-09 08:10:36 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+    <!-- Add cities to the company form -->
+    <record id="view_company_form_city" model="ir.ui.view">
+      <field name="name">res.company.form.city</field>
+      <field name="model">res.company</field>
+      <field name="inherit_id" ref="base.view_company_form"/>
+      <field name="arch" type="xml">
+        <field name="street2" position="after">
+          <field name="better_zip_id"
+                 colspan="4"
+                 on_change="on_change_city(better_zip_id)"
+                 placeholder="City completion" />
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>

=== added file 'base_location/i18n/base_location.pot'
--- base_location/i18n/base_location.pot	1970-01-01 00:00:00 +0000
+++ base_location/i18n/base_location.pot	2013-07-09 08:10:36 +0000
@@ -0,0 +1,109 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_location
+#
+msgid ""
+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"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_location
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+msgid "Cites/locations Management"
+msgstr ""
+
+#. module: base_location
+#: field:res.better.zip,city:0
+msgid "City"
+msgstr ""
+
+#. module: base_location
+#: view:res.better.zip:0
+#: field:res.better.zip,name:0
+msgid "ZIP"
+msgstr ""
+
+#. module: base_location
+#: field:res.better.zip,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: base_location
+#: field:res.better.zip,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_location
+#: field:res.better.zip,code:0
+msgid "City Code"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid " City/locations completion object"
+msgstr ""
+
+#. module: base_location
+#: help:res.company,better_zip_id:0
+msgid "Use the city name or the zip code to search the location"
+msgstr ""
+
+#. module: base_location
+#: field:res.partner,zip_id:0
+msgid "City/Location"
+msgstr ""
+
+#. module: base_location
+#: field:res.better.zip,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: base_location
+#: field:res.company,better_zip_id:0
+msgid "Location"
+msgstr ""
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base_location
+#: view:res.company:0
+#: view:res.partner:0
+msgid "City completion"
+msgstr ""
+
+#. module: base_location
+#: field:res.country.state,better_zip_ids:0
+msgid "Cities"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr ""
+
+#. module: base_location
+#: help:res.better.zip,code:0
+msgid "The official code for the city"
+msgstr ""
+

=== added file 'base_location/i18n/en.po'
--- base_location/i18n/en.po	1970-01-01 00:00:00 +0000
+++ base_location/i18n/en.po	2013-07-09 08:10:36 +0000
@@ -0,0 +1,107 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#       * better_zip
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-07 14:17+0000\n"
+"PO-Revision-Date: 2013-05-08 12:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: better_zip
+#: model:ir.actions.act_window,name:better_zip.action_zip_tree
+msgid "Cites/locations Management"
+msgstr "Cites/locations Management"
+
+#. module: better_zip
+#: field:res.better.zip,city:0
+msgid "City"
+msgstr "City"
+
+#. module: better_zip
+#: view:res.better.zip:0 field:res.better.zip,name:0
+msgid "ZIP"
+msgstr "ZIP"
+
+#. module: better_zip
+#: field:res.better.zip,country_id:0
+msgid "Country"
+msgstr "Country"
+
+#. module: better_zip
+#: field:res.better.zip,priority:0
+msgid "Priority"
+msgstr "Priority"
+
+#. module: better_zip
+#: model:ir.model,name:better_zip.model_res_company
+msgid "Companies"
+msgstr "Companies"
+
+#. module: better_zip
+#: field:res.better.zip,code:0
+msgid "City Code"
+msgstr "City Code"
+
+#. module: better_zip
+#: model:ir.model,name:better_zip.model_res_better_zip
+msgid " City/locations completion object"
+msgstr " City/locations completion object"
+
+#. module: better_zip
+#: help:res.company,better_zip_id:0
+msgid "Use the city name or the zip code to search the location"
+msgstr "Use the city name or the zip code to search the location"
+
+#. module: better_zip
+#: field:res.partner,zip_id:0
+msgid "City/Location"
+msgstr "City/Location"
+
+#. module: better_zip
+#: field:res.better.zip,state_id:0
+msgid "State"
+msgstr "State"
+
+#. module: better_zip
+#: field:res.company,better_zip_id:0
+msgid "Location"
+msgstr "Location"
+
+#. module: better_zip
+#: model:ir.ui.menu,name:better_zip.zip_base
+msgid "Cities/Locations Management"
+msgstr "Cities/Locations Management"
+
+#. module: better_zip
+#: model:ir.model,name:better_zip.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: better_zip
+#: view:res.company:0 view:res.partner:0
+msgid "City completion"
+msgstr "City completion"
+
+#. module: better_zip
+#: field:res.country.state,better_zip_ids:0
+msgid "Cities"
+msgstr "Cities"
+
+#. module: better_zip
+#: model:ir.model,name:better_zip.model_res_country_state
+msgid "Country state"
+msgstr "Country state"
+
+#. module: better_zip
+#: help:res.better.zip,code:0
+msgid "The official code for the city"
+msgstr "The official code for the city"

=== added file 'base_location/i18n/es.po'
--- base_location/i18n/es.po	1970-01-01 00:00:00 +0000
+++ base_location/i18n/es.po	2013-07-09 08:10:36 +0000
@@ -0,0 +1,109 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_location
+#
+msgid ""
+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"
+"Last-Translator: Pedro Manuel Baeza <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: base_location
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+msgid "Cites/locations Management"
+msgstr "Gestión de ciudades/ubicaciones"
+
+#. module: base_location
+#: field:res.better.zip,city:0
+msgid "City"
+msgstr "Ciudad"
+
+#. module: base_location
+#: view:res.better.zip:0
+#: field:res.better.zip,name:0
+msgid "ZIP"
+msgstr "C.P."
+
+#. module: base_location
+#: field:res.better.zip,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: base_location
+#: field:res.better.zip,priority:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: base_location
+#: field:res.better.zip,code:0
+msgid "City Code"
+msgstr "Código de ciudad"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid " City/locations completion object"
+msgstr " Objeto de completado de ciudad/ubicación"
+
+#. module: base_location
+#: help:res.company,better_zip_id:0
+msgid "Use the city name or the zip code to search the location"
+msgstr "Utilice el nombre de ciudad o el código postal para buscar la ubicación"
+
+#. module: base_location
+#: field:res.partner,zip_id:0
+msgid "City/Location"
+msgstr "Ciudad/Ubicación"
+
+#. module: base_location
+#: field:res.better.zip,state_id:0
+msgid "State"
+msgstr "Provincia"
+
+#. module: base_location
+#: field:res.company,better_zip_id:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr "Ciudad/Ubicaciones"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: base_location
+#: view:res.company:0
+#: view:res.partner:0
+msgid "City completion"
+msgstr "Autocompletado a partir de la ciudad"
+
+#. module: base_location
+#: field:res.country.state,better_zip_ids:0
+msgid "Cities"
+msgstr "Ciudades"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr "Provincia"
+
+#. module: base_location
+#: help:res.better.zip,code:0
+msgid "The official code for the city"
+msgstr "El código oficial para la ciudad"
+

=== added file 'base_location/i18n/fr.po'
--- base_location/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ base_location/i18n/fr.po	2013-07-09 08:10:36 +0000
@@ -0,0 +1,107 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#       * better_zip
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-07 14:17+0000\n"
+"PO-Revision-Date: 2013-05-08 12:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: better_zip
+#: model:ir.actions.act_window,name:better_zip.action_zip_tree
+msgid "Cites/locations Management"
+msgstr "Cites/locations Management"
+
+#. module: better_zip
+#: field:res.better.zip,city:0
+msgid "City"
+msgstr "Ville"
+
+#. module: better_zip
+#: view:res.better.zip:0 field:res.better.zip,name:0
+msgid "ZIP"
+msgstr "ZIP"
+
+#. module: better_zip
+#: field:res.better.zip,country_id:0
+msgid "Country"
+msgstr "Pays"
+
+#. module: better_zip
+#: field:res.better.zip,priority:0
+msgid "Priority"
+msgstr "Priorité"
+
+#. module: better_zip
+#: model:ir.model,name:better_zip.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: better_zip
+#: field:res.better.zip,code:0
+msgid "City Code"
+msgstr "Code de la ville"
+
+#. module: better_zip
+#: model:ir.model,name:better_zip.model_res_better_zip
+msgid " City/locations completion object"
+msgstr " City/locations completion object"
+
+#. module: better_zip
+#: help:res.company,better_zip_id:0
+msgid "Use the city name or the zip code to search the location"
+msgstr "Utilisez le nom de la ville ou le zip lors des recherches"
+
+#. module: better_zip
+#: field:res.partner,zip_id:0
+msgid "City/Location"
+msgstr "Ville/location"
+
+#. module: better_zip
+#: field:res.better.zip,state_id:0
+msgid "State"
+msgstr "Etat"
+
+#. module: better_zip
+#: field:res.company,better_zip_id:0
+msgid "Location"
+msgstr "Location"
+
+#. module: better_zip
+#: model:ir.ui.menu,name:better_zip.zip_base
+msgid "Cities/Locations Management"
+msgstr "Cities/Locations Management"
+
+#. module: better_zip
+#: model:ir.model,name:better_zip.model_res_partner
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: better_zip
+#: view:res.company:0 view:res.partner:0
+msgid "City completion"
+msgstr "Complétion par ville"
+
+#. module: better_zip
+#: field:res.country.state,better_zip_ids:0
+msgid "Cities"
+msgstr "Villes"
+
+#. module: better_zip
+#: model:ir.model,name:better_zip.model_res_country_state
+msgid "Country state"
+msgstr "Etat"
+
+#. module: better_zip
+#: help:res.better.zip,code:0
+msgid "The official code for the city"
+msgstr "Code officiel de la ville"

=== added file 'base_location/partner.py'
--- base_location/partner.py	1970-01-01 00:00:00 +0000
+++ base_location/partner.py	2013-07-09 08:10:36 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi. Copyright Camptocamp SA
+#    Contributor: Pedro Manuel Baeza <[e-mail]>
+#                 Ignacio Ibeas <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import orm, fields
+
+
+class ResPartner(orm.Model):
+    _inherit = "res.partner"
+    _columns = {'zip_id': fields.many2one('res.better.zip', 'City/Location')}
+
+    def onchange_zip_id(self, cursor, uid, ids, zip_id, context=None):
+        if not zip_id:
+            return {}
+        if isinstance(zip_id, list):
+            zip_id = zip_id[0]
+        bzip = self.pool['res.better.zip'].browse(cursor, uid, zip_id, context=context)
+        return {'value': {'zip': bzip.name,
+                          'city': bzip.city,
+                          'country_id': bzip.country_id.id if bzip.country_id else False,
+                          'state_id': bzip.state_id.id if bzip.state_id else False,
+                          }
+                }

=== added file 'base_location/partner_view.xml'
--- base_location/partner_view.xml	1970-01-01 00:00:00 +0000
+++ base_location/partner_view.xml	2013-07-09 08:10:36 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+  <data>
+    <record id="view_partner_form" model="ir.ui.view">
+      <field name="name">res.partner.zip_id.2</field>
+      <field name="model">res.partner</field>
+      <field name="inherit_id" ref="base.view_partner_form"/>
+      <field name="arch" type="xml">
+        <field name="city" position="before">
+          <field name="zip_id"
+                 on_change="onchange_zip_id(zip_id)"
+                 placeholder="City completion"/>
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>

=== added file 'base_location/security/ir.model.access.csv'
--- base_location/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ base_location/security/ir.model.access.csv	2013-07-09 08:10:36 +0000
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"ir_model_access_betterzip0","res_better_zip group_user_all","model_res_better_zip",base.group_user,1,0,0,0
+"ir_model_access_betterzip1","res_better_zip group_user","model_res_better_zip","base.group_partner_manager",1,1,1,1
\ No newline at end of file

=== added file 'base_location/state.py'
--- base_location/state.py	1970-01-01 00:00:00 +0000
+++ base_location/state.py	2013-07-09 08:10:36 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi. Copyright Camptocamp SA
+#    Contributor: Pedro Manuel Baeza <[e-mail]>
+#                 Ignacio Ibeas <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import orm, fields
+
+
+class ResCountryState(orm.Model):
+
+    _inherit = 'res.country.state'
+
+    _columns = {'better_zip_ids': fields.one2many('res.better.zip', 'state_id', 'Cities')}

=== added file 'base_location/state_view.xml'
--- base_location/state_view.xml	1970-01-01 00:00:00 +0000
+++ base_location/state_view.xml	2013-07-09 08:10:36 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+    <!-- Add cities to the State form -->
+    <record model="ir.ui.view" id="view_country_state_form2">
+      <field name="name">view_country_state_form2</field>
+      <field name="model">res.country.state</field>
+      <field name="inherit_id" ref="base.view_country_state_form"/>
+      <field name="arch" type="xml">
+        <field name="country_id" position="after">
+          <field name="better_zip_ids"
+                 context="{'country_id': country_id}"
+                 colspan="4"
+                 nolabel="1">
+            <tree editable="top">
+              <field name="name"/>
+              <field name="code"/>
+              <field name="city"/>
+              <field name="country_id"/>
+            </tree>
+          </field>
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>

=== added symlink 'better_zip'
=== target is u'base_location'
=== removed file 'better_zip/security/security.xml'
--- better_zip/security/security.xml	2013-01-16 15:22:41 +0000
+++ better_zip/security/security.xml	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-<openerp>
-    <data>
-        <record id="ir_model_access_betterzip0" model="ir.model.access">
-            <field name="model_id" ref="better_zip.model_res_better_zip"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="'better_zip'" name="name"/>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="base.group_user"/>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file