Merge lp:~acysos-team/partner-contact-management/partner-contact-management-city-6.1 into lp:~partner-contact-core-editors/partner-contact-management/6.1

[Ignacio Ibeas (www.acysos.com)]

Add module city.

Creates a model for storing cities
Zip code, city, state and country fields are replaced with a location field in partner and partner contact forms.
This module helps to keep homogeneous address data in the database.

[lp:~acysos-team/partner-contact-management/partner-contact-management-city-6.1]

7. By Ignacio Ibeas (www.acysos.com) on 2013-05-01

[FIX] city: spanish translation, websites

8. By Ignacio Ibeas (www.acysos.com) on 2013-05-01

[FIX] city: change name zipcode

[Numérigraphe (numerigraphe)]

My comments about the trunk branch apply here too : https://code.launchpad.net/~pedro.baeza/partner-contact-management/city-module/+merge/161837

review: Resubmit (general review, untested)

[Numérigraphe (numerigraphe)]

Users now have to enter redundent data, which I find is a regression from the former behavior in the trunk extra-addons.

review: Disapprove (functional)

[Ignacio Ibeas (www.acysos.com) (ignacio-acysos)]

Yes, I see and I have add AGPL-3, but I can't push the new commit.
Extra-trunk city doesn't work.

About enter redundant data, I'm not accord. It's a method to get city like a class, an use in all partners with the same data. Also you can create a module that import all cities, like l10n_es_toponyms from geonames and get all cities and zip of a country.

[lp:~acysos-team/partner-contact-management/partner-contact-management-city-6.1]

9. By Ignacio Ibeas (www.acysos.com) on 2013-05-02

[FIX] city: license added

[Ignacio Ibeas (www.acysos.com) (ignacio-acysos)]

I see that there are a discussion about this module in 7.0. But here there isn't better_zip, only exist this module, because city of extra-trunk doesn't work properly.

You will approve the merge??

Greetings

[Numérigraphe (numerigraphe)]

Wouldn't it be better to fix "city" directly in the extra addons while
better_zip is being worked on?
Then when better_zip is ready, we can probably backport it from v7.0.
Lionel Sausin.

Le 06/05/2013 17:06, Ignacio Ibeas (www.acysos.com) a écrit :
> I see that there are a discussion about this module in 7.0. But here there isn't better_zip, only exist this module, because city of extra-trunk doesn't work properly.
>
> You will approve the merge??
>
> Greetings

[Ignacio Ibeas (www.acysos.com) (ignacio-acysos)]

OpenERP commiters is deprecated (https://launchpad.net/~openerp-commiter), so I understand that their repositories are deprecated.

I upload in my repositories.

Thank you for your time.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I saw recent discussions on the city / better_zip addons. I guess that another MP has been created for this. Can we close this MP?

review: Needs Information

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> I saw recent discussions on the city / better_zip addons. I guess that another
> MP has been created for this. Can we close this MP?

Here it is: https://code.launchpad.net/~camptocamp/partner-contact-management/city_into_better_zip/+merge/162771

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> > I saw recent discussions on the city / better_zip addons. I guess that
> another
> > MP has been created for this. Can we close this MP?
>
> Here it is: https://code.launchpad.net/~camptocamp/partner-contact-
> management/city_into_better_zip/+merge/162771

The MP I mentioned has been merged, so I put this one as 'rejected'.

review: Disapprove

Unmerged revisions

9. By Ignacio Ibeas (www.acysos.com) on 2013-05-02

[FIX] city: license added

8. By Ignacio Ibeas (www.acysos.com) on 2013-05-01

[FIX] city: change name zipcode

7. By Ignacio Ibeas (www.acysos.com) on 2013-05-01

[FIX] city: spanish translation, websites

6. By Ignacio Ibeas (www.acysos.com) on 2013-04-30

[ADD] city: City-Helps to keep Homogeneous address data in the Database

=== added directory 'city'
=== added file 'city/__init__.py'
--- city/__init__.py	1970-01-01 00:00:00 +0000
+++ city/__init__.py	2013-05-02 10:24:27 +0000
@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Servicios Baeza (http://www.serviciosbaeza.com/) All Rights Reserved.
+#                       Pedro Manuel Baeza <[e-mail]>
+#    Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
+#                       Ignacio Ibeas <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import city
+import partner
+import country
+import company
\ No newline at end of file

=== added file 'city/__openerp__.py'
--- city/__openerp__.py	1970-01-01 00:00:00 +0000
+++ city/__openerp__.py	2013-05-02 10:24:27 +0000
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    "name" : "City-Helps to keep Homogeneous address data in the Database",
+    "version" : "2.0",
+    "author" : "Acysos S.L., Pedro Manuel Baeza, Pablo Rocandio",
+    "website" : "www.acysos.com, www.serviciosbaeza.com",
+    "license" : "AGPL-3",
+    "category" : "Hidden",
+    "description": """Creates a model for storing cities
+Zip code, city, state and country fields are replaced with a location field in partner and partner contact forms.
+This module helps to keep homogeneous address data in the database.""",
+    "depends" : ["base"],
+    "init_xml" : [],
+    "update_xml" : [
+        'city_view.xml',
+        'partner_view.xml',
+        'country_view.xml',
+        'company_view.xml',
+        'security/ir.model.access.csv'
+        ],
+    "active": False,
+    "installable": True
+}

=== added file 'city/city.py'
--- city/city.py	1970-01-01 00:00:00 +0000
+++ city/city.py	2013-05-02 10:24:27 +0000
@@ -0,0 +1,70 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Servicios Baeza (http://www.serviciosbaeza.com/) All Rights Reserved.
+#                       Pedro Manuel Baeza <[e-mail]>
+#    Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
+#                       Ignacio Ibeas <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import wizard
+import pooler
+
+class city(osv.osv):
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        res = []
+        for line in self.browse(cr, uid, ids, context=context):
+            name = line.name
+            if line.zip:
+                name = "%s %s" % (line.zip, name)
+            if line.state_id:
+                name = "%s, %s" % (name, line.state_id.name)
+            if line.country_id:
+                name = "%s, %s" % (name, line.country_id.name)
+            res.append((line['id'], name))
+        return res
+
+    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, [('zip', 'ilike', name)]+ args, limit=limit)
+        if not ids:
+            ids = self.search(cr, uid, [('name', operator, name)]+ args, limit=limit)
+        return self.name_get(cr, uid, ids, context=context)
+
+    _name = 'city.city'
+    _description = 'City'
+    _columns = {
+        'state_id': fields.many2one('res.country.state', 'State',
+            domain="[('country_id','=',country_id)]", select=1),
+        'name': fields.char('City', size=64, required=True, select=1),
+        'zip': fields.char('ZIP', size=64, required=True, select=1),
+        'country_id': fields.many2one('res.country', 'Country', select=1),
+        'code': fields.char('City Code', size=64,
+            help="The official code for the city"),
+    }
+city()

=== added file 'city/city_view.xml'
--- city/city_view.xml	1970-01-01 00:00:00 +0000
+++ city/city_view.xml	2013-05-02 10:24:27 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <!-- City -->
+    <record model="ir.ui.view" id="view_city_tree">
+        <field name="name">city.city.tree</field>
+        <field name="model">city.city</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="City">
+                <field name="zip"/>
+                <field name="name"/>
+                <field name="state_id"/>
+                <field name="country_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_city_form">
+        <field name="name">city.city.form</field>
+        <field name="model">city.city</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="City">
+                <field name="zip" select="1"/>
+                <field name="name" select="1"/>
+                <field name="country_id" />
+                <field name="state_id" select="1"/>
+                <field name="code" select="2"/>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_city">
+        <field name="name">City</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">city.city</field>
+        <field name="view_type">form</field>
+    </record>
+
+    <menuitem name="Cities" groups="base.group_system" action="action_city" parent="base.menu_localisation" id="menu_city_partner"/>
+
+    </data>
+</openerp>

=== added file 'city/company.py'
--- city/company.py	1970-01-01 00:00:00 +0000
+++ city/company.py	2013-05-02 10:24:27 +0000
@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
+#                       Ignacio Ibeas <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import wizard
+import pooler
+
+class res_company(osv.osv):
+    _inherit = "res.company"
+    
+    def on_change_city(self,cr,uid,ids,city_id):
+        result = {}
+        if city_id:
+            city = self.pool.get('city.city').browse(cr, uid, city_id)
+            result = {'value': {
+                        'zip': city.zip,
+                        'country_id': city.country_id.id,
+                        'city': city.name,
+                        'state_id': city.state_id.id
+                    }
+                }
+        return result
+    
+    _columns = {
+        'city_id': fields.many2one('city.city', 'Location', select=1,
+        help='Use the name or the zip to search the location'),
+    }
+    
+res_company()
\ No newline at end of file

=== added file 'city/company_view.xml'
--- city/company_view.xml	1970-01-01 00:00:00 +0000
+++ city/company_view.xml	2013-05-02 10:24:27 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!-- Add cities to the State form -->
+        <record id="view_company_form_city" model="ir.ui.view">
+            <field name="name">res.company.form</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <field name="street2" position="after">
+                    <field name="city_id" colspan="4"  on_change="on_change_city(city_id)" />
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'city/country.py'
--- city/country.py	1970-01-01 00:00:00 +0000
+++ city/country.py	2013-05-02 10:24:27 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Servicios Baeza (http://www.serviciosbaeza.com/) All Rights Reserved.
+#                       Pedro Manuel Baeza <[e-mail]>
+#    Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
+#                       Ignacio Ibeas <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import wizard
+import pooler
+
+class CountryState(osv.osv):
+    _inherit = 'res.country.state'
+    _columns = {
+        'city_ids': fields.one2many('city.city', 'state_id', 'Cities'),
+    }
+CountryState()
\ No newline at end of file

=== added file 'city/country_view.xml'
--- city/country_view.xml	1970-01-01 00:00:00 +0000
+++ city/country_view.xml	2013-05-02 10:24:27 +0000
@@ -0,0 +1,16 @@
+<?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="code" position="after">
+                    <field name="city_ids" colspan="4" nolabel="1" widget="one2many_list"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'city/i18n'
=== added file 'city/i18n/bg.po'
--- city/i18n/bg.po	1970-01-01 00:00:00 +0000
+++ city/i18n/bg.po	2013-05-02 10:24:27 +0000
@@ -0,0 +1,88 @@
+# Bulgarian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
+"PO-Revision-Date: 2011-02-26 10:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: city
+#: view:city.city:0
+#: model:ir.actions.act_window,name:city.action_city
+#: model:ir.model,name:city.model_city_city
+#: model:ir.module.module,shortdesc:city.module_meta_information
+msgid "City"
+msgstr "Град"
+
+#. module: city
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: city
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Името на обекта трябва да започва с x_ и не може да никакви специални знаци !"
+
+#. module: city
+#: field:city.city,zip:0
+msgid "ZIP"
+msgstr ""
+
+#. module: city
+#: field:city.city,state_id:0
+msgid "State"
+msgstr "Област"
+
+#. module: city
+#: field:city.city,country_id:0
+msgid "Country"
+msgstr "Държава"
+
+#. module: city
+#: field:city.city,code:0
+msgid "City Code"
+msgstr "Код на града"
+
+#. module: city
+#: model:ir.module.module,description:city.module_meta_information
+msgid ""
+"Creates a model for storing cities\n"
+"Zip code, city, state and country fields are replaced with a location field "
+"in partner and partner contact forms.\n"
+"This module helps to keep homogeneous address data in the database."
+msgstr ""
+
+#. module: city
+#: field:city.city,name:0
+msgid "City Name"
+msgstr "Име на град"
+
+#. module: city
+#: field:res.partner.address,city_id:0
+msgid "Location"
+msgstr "Местоположение"
+
+#. module: city
+#: help:city.city,code:0
+msgid "The official code for the city"
+msgstr ""
+
+#. module: city
+#: model:ir.ui.menu,name:city.menu_city_partner
+#: field:res.country.state,city_ids:0
+msgid "Cities"
+msgstr "Градове"

=== added file 'city/i18n/ca.po'
--- city/i18n/ca.po	1970-01-01 00:00:00 +0000
+++ city/i18n/ca.po	2013-05-02 10:24:27 +0000
@@ -0,0 +1,94 @@
+# Translation of OpenERP Server.
+# This file containt the translation of the following modules:
+#	* city
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0-alpha\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
+"PO-Revision-Date: 2010-01-19 05:17+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: city
+#: view:city.city:0
+#: model:ir.actions.act_window,name:city.action_city
+#: model:ir.model,name:city.model_city_city
+#: model:ir.module.module,shortdesc:city.module_meta_information
+msgid "City"
+msgstr "Ciutat"
+
+#. module: city
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML no vàlid per a la definició de la vista!"
+
+#. module: city
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+"especial !"
+
+#. module: city
+#: field:city.city,zip:0
+msgid "ZIP"
+msgstr "Codi postal"
+
+#. module: city
+#: field:city.city,state_id:0
+msgid "State"
+msgstr "Província"
+
+#. module: city
+#: field:city.city,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: city
+#: field:city.city,code:0
+msgid "City Code"
+msgstr "Codi de ciutat"
+
+#. module: city
+#: model:ir.module.module,description:city.module_meta_information
+msgid ""
+"Creates a model for storing cities\n"
+"Zip code, city, state and country fields are replaced with a location field "
+"in partner and partner contact forms.\n"
+"This module helps to keep homogeneous address data in the database."
+msgstr ""
+"Crea un model per emmagatzemar ciutats.\n"
+"Els camps de codi postal, província i país són reemplaçats amb un camp de "
+"localització en els formularis d'empresa i contacte/adreça d'empresa.\n"
+"Aquest mòdul ajuda a mantenir informació homogènia d'adreces a la base de "
+"dades."
+
+#. module: city
+#: field:city.city,name:0
+msgid "City Name"
+msgstr "Nom de la ciutat"
+
+#. module: city
+#: field:res.partner.address,city_id:0
+msgid "Location"
+msgstr "Ubicació"
+
+#. module: city
+#: help:city.city,code:0
+msgid "The official code for the city"
+msgstr "El codi oficial de la ciutat."
+
+#. module: city
+#: model:ir.ui.menu,name:city.menu_city_partner
+#: field:res.country.state,city_ids:0
+msgid "Cities"
+msgstr "Ciutats"

=== added file 'city/i18n/city.pot'
--- city/i18n/city.pot	1970-01-01 00:00:00 +0000
+++ city/i18n/city.pot	2013-05-02 10:24:27 +0000
@@ -0,0 +1,76 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* city
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.4\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2013-04-30 12:00+0000\n"
+"PO-Revision-Date: 2013-04-30 12:00+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: city
+#: view:city.city:0
+#: field:city.city,name:0
+#: model:ir.actions.act_window,name:city.action_city
+#: model:ir.model,name:city.model_city_city
+msgid "City"
+msgstr ""
+
+#. module: city
+#: model:ir.model,name:city.model_res_partner_address
+msgid "Partner Addresses"
+msgstr ""
+
+#. module: city
+#: field:city.city,zip:0
+msgid "ZIP"
+msgstr ""
+
+#. module: city
+#: field:city.city,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: city
+#: help:res.partner.address,location:0
+msgid "Use the name or the zip to search the location"
+msgstr ""
+
+#. module: city
+#: field:city.city,code:0
+msgid "City Code"
+msgstr ""
+
+#. module: city
+#: field:city.city,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: city
+#: field:res.partner.address,location:0
+msgid "Location"
+msgstr ""
+
+#. module: city
+#: help:city.city,code:0
+msgid "The official code for the city"
+msgstr ""
+
+#. module: city
+#: model:ir.ui.menu,name:city.menu_city_partner
+#: field:res.country.state,city_ids:0
+msgid "Cities"
+msgstr ""
+
+#. module: city
+#: model:ir.model,name:city.model_res_country_state
+msgid "Country state"
+msgstr ""
+

=== added file 'city/i18n/es.po'
--- city/i18n/es.po	1970-01-01 00:00:00 +0000
+++ city/i18n/es.po	2013-05-02 10:24:27 +0000
@@ -0,0 +1,76 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* city
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.4\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2013-04-30 12:01+0000\n"
+"PO-Revision-Date: 2013-04-30 12:01+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: city
+#: view:city.city:0
+#: field:city.city,name:0
+#: model:ir.actions.act_window,name:city.action_city
+#: model:ir.model,name:city.model_city_city
+msgid "City"
+msgstr "Ciudad"
+
+#. module: city
+#: model:ir.model,name:city.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Direcciones de empresa"
+
+#. module: city
+#: field:city.city,zip:0
+msgid "ZIP"
+msgstr "Código postal"
+
+#. module: city
+#: field:city.city,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: city
+#: help:res.partner.address,location:0
+msgid "Use the name or the zip to search the location"
+msgstr "Utilice el nombre o el código postal para buscar la localización"
+
+#. module: city
+#: field:city.city,code:0
+msgid "City Code"
+msgstr "Código de ciudad"
+
+#. module: city
+#: field:city.city,state_id:0
+msgid "State"
+msgstr "Provincia"
+
+#. module: city
+#: field:res.partner.address,location:0
+msgid "Location"
+msgstr "Location"
+
+#. module: city
+#: help:city.city,code:0
+msgid "The official code for the city"
+msgstr "Código oficial de la ciudad."
+
+#. module: city
+#: model:ir.ui.menu,name:city.menu_city_partner
+#: field:res.country.state,city_ids:0
+msgid "Cities"
+msgstr "Ciudades"
+
+#. module: city
+#: model:ir.model,name:city.model_res_country_state
+msgid "Country state"
+msgstr "Provincia"
+

=== added file 'city/i18n/fi.po'
--- city/i18n/fi.po	1970-01-01 00:00:00 +0000
+++ city/i18n/fi.po	2013-05-02 10:24:27 +0000
@@ -0,0 +1,88 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
+"PO-Revision-Date: 2011-06-28 06:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: city
+#: view:city.city:0
+#: model:ir.actions.act_window,name:city.action_city
+#: model:ir.model,name:city.model_city_city
+#: model:ir.module.module,shortdesc:city.module_meta_information
+msgid "City"
+msgstr "Kaupunki"
+
+#. module: city
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#. module: city
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Objektin nimi täytyy alkaa X_ eikä se saa sisältää mitää erikoismerkkejä!"
+
+#. module: city
+#: field:city.city,zip:0
+msgid "ZIP"
+msgstr "Postinumero"
+
+#. module: city
+#: field:city.city,state_id:0
+msgid "State"
+msgstr "Osavaltio"
+
+#. module: city
+#: field:city.city,country_id:0
+msgid "Country"
+msgstr "Maa"
+
+#. module: city
+#: field:city.city,code:0
+msgid "City Code"
+msgstr "Maakoodi"
+
+#. module: city
+#: model:ir.module.module,description:city.module_meta_information
+msgid ""
+"Creates a model for storing cities\n"
+"Zip code, city, state and country fields are replaced with a location field "
+"in partner and partner contact forms.\n"
+"This module helps to keep homogeneous address data in the database."
+msgstr ""
+
+#. module: city
+#: field:city.city,name:0
+msgid "City Name"
+msgstr "Kaupungin nimi"
+
+#. module: city
+#: field:res.partner.address,city_id:0
+msgid "Location"
+msgstr "Sijainti"
+
+#. module: city
+#: help:city.city,code:0
+msgid "The official code for the city"
+msgstr "Kaupungin viralinen koodi"
+
+#. module: city
+#: model:ir.ui.menu,name:city.menu_city_partner
+#: field:res.country.state,city_ids:0
+msgid "Cities"
+msgstr "Kaupungit"

=== added file 'city/i18n/fr.po'
--- city/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ city/i18n/fr.po	2013-05-02 10:24:27 +0000
@@ -0,0 +1,93 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* city
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
+"PO-Revision-Date: 2010-01-19 05:16+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: city
+#: view:city.city:0
+#: model:ir.actions.act_window,name:city.action_city
+#: model:ir.model,name:city.model_city_city
+#: model:ir.module.module,shortdesc:city.module_meta_information
+msgid "City"
+msgstr "Ville"
+
+#. module: city
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: city
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
+
+#. module: city
+#: field:city.city,zip:0
+msgid "ZIP"
+msgstr "Code postal"
+
+#. module: city
+#: field:city.city,state_id:0
+msgid "State"
+msgstr "État"
+
+#. module: city
+#: field:city.city,country_id:0
+msgid "Country"
+msgstr "Pays"
+
+#. module: city
+#: field:city.city,code:0
+msgid "City Code"
+msgstr "Code de la ville"
+
+#. module: city
+#: model:ir.module.module,description:city.module_meta_information
+msgid ""
+"Creates a model for storing cities\n"
+"Zip code, city, state and country fields are replaced with a location field "
+"in partner and partner contact forms.\n"
+"This module helps to keep homogeneous address data in the database."
+msgstr ""
+"Crée un modèle de données pour les villes.\n"
+"Les champs \"code postal\", \"ville\", \"état\" et \"pays\" sont remplacés "
+"par un champ \"localisation\" dans les formulaires \"partenaire\" et "
+"\"contacts du partenaire\".Ce module permet de conserver des données "
+"d'adresse homogènes."
+
+#. module: city
+#: field:city.city,name:0
+msgid "City Name"
+msgstr "Nom de la ville"
+
+#. module: city
+#: field:res.partner.address,city_id:0
+msgid "Location"
+msgstr "Localisation"
+
+#. module: city
+#: help:city.city,code:0
+msgid "The official code for the city"
+msgstr "Le code officiel de la ville"
+
+#. module: city
+#: model:ir.ui.menu,name:city.menu_city_partner
+#: field:res.country.state,city_ids:0
+msgid "Cities"
+msgstr "Villes"

=== added file 'city/i18n/fr_BE.po'
--- city/i18n/fr_BE.po	1970-01-01 00:00:00 +0000
+++ city/i18n/fr_BE.po	2013-05-02 10:24:27 +0000
@@ -0,0 +1,85 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* city
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-02-27 09:13:15+0000\n"
+"PO-Revision-Date: 2009-02-27 10:22+0100\n"
+"Last-Translator: Numerigraphe <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: "
+
+#. module: city
+#: view:city.city:0
+#: model:ir.actions.act_window,name:city.action_city
+#: model:ir.model,name:city.model_city_city
+#: model:ir.module.module,shortdesc:city.module_meta_information
+msgid "City"
+msgstr "Ville"
+
+#. module: city
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: city
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+
+#. module: city
+#: field:city.city,zip:0
+msgid "ZIP"
+msgstr "Code postal"
+
+#. module: city
+#: field:city.city,state_id:0
+msgid "State"
+msgstr "État"
+
+#. module: city
+#: field:city.city,country_id:0
+msgid "Country"
+msgstr "Pays"
+
+#. module: city
+#: field:city.city,code:0
+msgid "City Code"
+msgstr "Code de la ville"
+
+#. module: city
+#: model:ir.module.module,description:city.module_meta_information
+msgid "Creates a model for storing cities\n"
+"Zip code, city, state and country fields are replaced with a location field in partner and partner contact forms.\n"
+"This module helps to keep homogeneous address data in the database."
+msgstr "Crée un modèle de données pour les villes.\n"
+"Les champs \"code postal\", \"ville\", \"état\" et \"pays\" sont remplacés par un champ \"localisation\" dans les formulaires \"partenaire\" et \"contacts du partenaire\"."
+"Ce module permet de conserver des données d'adresse homogènes."
+
+#. module: city
+#: field:city.city,name:0
+msgid "City Name"
+msgstr "Nom de la ville"
+
+#. module: city
+#: field:res.partner.address,city_id:0
+msgid "Location"
+msgstr "Localisation"
+
+#. module: city
+#: help:city.city,code:0
+msgid "The official code for the city"
+msgstr "Le code officiel de la ville"
+
+#. module: city
+#: model:ir.ui.menu,name:city.menu_city_partner
+#: field:res.country.state,city_ids:0
+msgid "Cities"
+msgstr "Villes"
+

=== added file 'city/i18n/ru.po'
--- city/i18n/ru.po	1970-01-01 00:00:00 +0000
+++ city/i18n/ru.po	2013-05-02 10:24:27 +0000
@@ -0,0 +1,89 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
+"PO-Revision-Date: 2011-03-30 17:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: city
+#: view:city.city:0
+#: model:ir.actions.act_window,name:city.action_city
+#: model:ir.model,name:city.model_city_city
+#: model:ir.module.module,shortdesc:city.module_meta_information
+msgid "City"
+msgstr "Город"
+
+#. module: city
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра структуры!"
+
+#. module: city
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Имя Объекта должно начинаться с x_ и не должно содержать специальных "
+"символов!"
+
+#. module: city
+#: field:city.city,zip:0
+msgid "ZIP"
+msgstr "Почтовый индекс"
+
+#. module: city
+#: field:city.city,state_id:0
+msgid "State"
+msgstr "Область/штат"
+
+#. module: city
+#: field:city.city,country_id:0
+msgid "Country"
+msgstr "Страна"
+
+#. module: city
+#: field:city.city,code:0
+msgid "City Code"
+msgstr "Код города"
+
+#. module: city
+#: model:ir.module.module,description:city.module_meta_information
+msgid ""
+"Creates a model for storing cities\n"
+"Zip code, city, state and country fields are replaced with a location field "
+"in partner and partner contact forms.\n"
+"This module helps to keep homogeneous address data in the database."
+msgstr ""
+
+#. module: city
+#: field:city.city,name:0
+msgid "City Name"
+msgstr "Название города"
+
+#. module: city
+#: field:res.partner.address,city_id:0
+msgid "Location"
+msgstr "Расположение"
+
+#. module: city
+#: help:city.city,code:0
+msgid "The official code for the city"
+msgstr "Официальный код для города"
+
+#. module: city
+#: model:ir.ui.menu,name:city.menu_city_partner
+#: field:res.country.state,city_ids:0
+msgid "Cities"
+msgstr "Города"

=== added file 'city/i18n/sv.po'
--- city/i18n/sv.po	1970-01-01 00:00:00 +0000
+++ city/i18n/sv.po	2013-05-02 10:24:27 +0000
@@ -0,0 +1,86 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* city
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.14\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
+"PO-Revision-Date: 2011-01-14 14:52+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: city
+#: view:city.city:0
+#: model:ir.actions.act_window,name:city.action_city
+#: model:ir.model,name:city.model_city_city
+#: model:ir.module.module,shortdesc:city.module_meta_information
+msgid "City"
+msgstr "Stad"
+
+#. module: city
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ogiltig XML för Vy-arkitektur!"
+
+#. module: city
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: city
+#: field:city.city,zip:0
+msgid "ZIP"
+msgstr "Postnummer"
+
+#. module: city
+#: field:city.city,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: city
+#: field:city.city,country_id:0
+msgid "Country"
+msgstr "Land"
+
+#. module: city
+#: field:city.city,code:0
+msgid "City Code"
+msgstr ""
+
+#. module: city
+#: model:ir.module.module,description:city.module_meta_information
+msgid ""
+"Creates a model for storing cities\n"
+"Zip code, city, state and country fields are replaced with a location field "
+"in partner and partner contact forms.\n"
+"This module helps to keep homogeneous address data in the database."
+msgstr ""
+
+#. module: city
+#: field:city.city,name:0
+msgid "City Name"
+msgstr "Stadens namn"
+
+#. module: city
+#: field:res.partner.address,city_id:0
+msgid "Location"
+msgstr "Plats"
+
+#. module: city
+#: help:city.city,code:0
+msgid "The official code for the city"
+msgstr ""
+
+#. module: city
+#: model:ir.ui.menu,name:city.menu_city_partner
+#: field:res.country.state,city_ids:0
+msgid "Cities"
+msgstr "Städer"

=== added file 'city/i18n/vi.po'
--- city/i18n/vi.po	1970-01-01 00:00:00 +0000
+++ city/i18n/vi.po	2013-05-02 10:24:27 +0000
@@ -0,0 +1,89 @@
+# Vietnamese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
+"PO-Revision-Date: 2011-03-28 15:42+0000\n"
+"Last-Translator: OpenBMS JSC <Unknown>\n"
+"Language-Team: Vietnamese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: city
+#: view:city.city:0
+#: model:ir.actions.act_window,name:city.action_city
+#: model:ir.model,name:city.model_city_city
+#: model:ir.module.module,shortdesc:city.module_meta_information
+msgid "City"
+msgstr "Thành phố/Quận"
+
+#. module: city
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML không hợp lệ cho Kiến trúc Xem!"
+
+#. module: city
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Tên đối tượng phải bắt đầu bằng x_ và không bao gồm bất kỳ ký tự đặc biệt "
+"nào!"
+
+#. module: city
+#: field:city.city,zip:0
+msgid "ZIP"
+msgstr "Mã bưu chính"
+
+#. module: city
+#: field:city.city,state_id:0
+msgid "State"
+msgstr "Tiểu bang"
+
+#. module: city
+#: field:city.city,country_id:0
+msgid "Country"
+msgstr "Quốc gia"
+
+#. module: city
+#: field:city.city,code:0
+msgid "City Code"
+msgstr "Mã Thành phố"
+
+#. module: city
+#: model:ir.module.module,description:city.module_meta_information
+msgid ""
+"Creates a model for storing cities\n"
+"Zip code, city, state and country fields are replaced with a location field "
+"in partner and partner contact forms.\n"
+"This module helps to keep homogeneous address data in the database."
+msgstr ""
+
+#. module: city
+#: field:city.city,name:0
+msgid "City Name"
+msgstr "Tên Thành phố"
+
+#. module: city
+#: field:res.partner.address,city_id:0
+msgid "Location"
+msgstr "Địa điểm"
+
+#. module: city
+#: help:city.city,code:0
+msgid "The official code for the city"
+msgstr "Mã chính thức của thành phố"
+
+#. module: city
+#: model:ir.ui.menu,name:city.menu_city_partner
+#: field:res.country.state,city_ids:0
+msgid "Cities"
+msgstr "Các thành phố"

=== added file 'city/partner.py'
--- city/partner.py	1970-01-01 00:00:00 +0000
+++ city/partner.py	2013-05-02 10:24:27 +0000
@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Servicios Baeza (http://www.serviciosbaeza.com/) All Rights Reserved.
+#                       Pedro Manuel Baeza <[e-mail]>
+#    Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
+#                       Ignacio Ibeas <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import wizard
+import pooler
+
+class res_partner_address(osv.osv):
+    _inherit = "res.partner.address"
+    
+    def on_change_city(self,cr,uid,ids,location):
+        result = {}
+        if location:
+            city = self.pool.get('city.city').browse(cr, uid, location)
+            result = {'value': {
+                        'zip': city.zip,
+                        'country_id': city.country_id.id,
+                        'city': city.name,
+                        'state_id': city.state_id.id
+                    }
+                }
+        return result
+    
+    _columns = {
+        'city_id': fields.many2one('city.city', 'Location', select=1,
+        help='Use the name or the zip to search the location'),
+    }
+res_partner_address()
\ No newline at end of file

=== added file 'city/partner_view.xml'
--- city/partner_view.xml	1970-01-01 00:00:00 +0000
+++ city/partner_view.xml	2013-05-02 10:24:27 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!-- Add city_id to the Partner form -->
+        <record model="ir.ui.view" id="view_partner_form_city">
+            <field name="name">res.partner.form.city</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='address']//field[@name='street2']" position="after">
+                        <field name="city_id" colspan="4" on_change="on_change_city(city_id)" />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+        <!-- Add city_id to the Partner Address form 1 -->
+        <record model="ir.ui.view" id="view_partner_address_form1_city">
+            <field name="name">res.partner.address.form1.city</field>
+            <field name="model">res.partner.address</field>
+            <field name="inherit_id" ref="base.view_partner_address_form1"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='street2']" position="after">
+                        <field name="city_id" on_change="on_change_city(city_id)" />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+        <!-- Add city_id to the Partner Address form 2 -->
+        <record model="ir.ui.view" id="view_partner_address_form2_city">
+            <field name="name">res.partner.address.form2.city</field>
+            <field name="model">res.partner.address</field>
+            <field name="inherit_id" ref="base.view_partner_address_form2"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='street2']" position="after">
+                        <field name="city_id" on_change="on_change_city(city_id)" />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'city/security'
=== added file 'city/security/ir.model.access.csv'
--- city/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ city/security/ir.model.access.csv	2013-05-02 10:24:27 +0000
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_city_city_group_all","city_city group_user_all","model_city_city",,1,0,0,0
+"access_city_city_group_user","city_city group_user","model_city_city","base.group_partner_manager",1,1,1,1