Merge lp:~acysos-team/openerp-spain/openerp-spain-6.0-city into lp:~openerp-spain-team/openerp-spain/6.0

Proposed by Ignacio Ibeas (www.acysos.com) on 2013-05-13
Status: Merged
Merged at revision: 345
Proposed branch: lp:~acysos-team/openerp-spain/openerp-spain-6.0-city
Merge into: lp:~openerp-spain-team/openerp-spain/6.0
Diff against target: 1306 lines (+1204/-0)
19 files modified
city/__init__.py (+28/-0)
city/__openerp__.py (+46/-0)
city/city.py (+70/-0)
city/city_view.xml (+45/-0)
city/country.py (+35/-0)
city/country_view.xml (+16/-0)
city/i18n/bg.po (+88/-0)
city/i18n/ca.po (+94/-0)
city/i18n/city.pot (+76/-0)
city/i18n/es.po (+76/-0)
city/i18n/fi.po (+88/-0)
city/i18n/fr.po (+93/-0)
city/i18n/fr_BE.po (+85/-0)
city/i18n/ru.po (+89/-0)
city/i18n/sv.po (+86/-0)
city/i18n/vi.po (+89/-0)
city/partner.py (+50/-0)
city/partner_view.xml (+47/-0)
city/security/ir.model.access.csv (+3/-0)
To merge this branch: bzr merge lp:~acysos-team/openerp-spain/openerp-spain-6.0-city
Reviewer Review Type Date Requested Status
Ignacio Ibeas (www.acysos.com) Approve on 2013-05-15
Review via email: mp+163488@code.launchpad.net

Description of the change

Añade el módulo city que usamos muchos en la localización y de momento no van a añadirlo en otros repositorios más lógicos.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'city'
2=== added file 'city/__init__.py'
3--- city/__init__.py 1970-01-01 00:00:00 +0000
4+++ city/__init__.py 2013-05-13 09:06:50 +0000
5@@ -0,0 +1,28 @@
6+# -*- encoding: utf-8 -*-
7+##############################################################################
8+#
9+# OpenERP, Open Source Management Solution
10+# Copyright (c) 2013 Servicios Baeza (http://www.serviciosbaeza.com/) All Rights Reserved.
11+# Pedro Manuel Baeza <pedro.baeza@gmail.com>
12+# Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
13+# Ignacio Ibeas <ignacio@acysos.com>
14+# $Id$
15+#
16+# This program is free software: you can redistribute it and/or modify
17+# it under the terms of the GNU General Public License as published by
18+# the Free Software Foundation, either version 3 of the License, or
19+# (at your option) any later version.
20+#
21+# This program is distributed in the hope that it will be useful,
22+# but WITHOUT ANY WARRANTY; without even the implied warranty of
23+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24+# GNU General Public License for more details.
25+#
26+# You should have received a copy of the GNU General Public License
27+# along with this program. If not, see <http://www.gnu.org/licenses/>.
28+#
29+##############################################################################
30+
31+import city
32+import partner
33+import country
34\ No newline at end of file
35
36=== added file 'city/__openerp__.py'
37--- city/__openerp__.py 1970-01-01 00:00:00 +0000
38+++ city/__openerp__.py 2013-05-13 09:06:50 +0000
39@@ -0,0 +1,46 @@
40+#!/usr/bin/env python
41+# -*- encoding: utf-8 -*-
42+##############################################################################
43+#
44+# OpenERP, Open Source Management Solution
45+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
46+# Copyright (c) 2013 Servicios Baeza (http://www.serviciosbaeza.com/) All Rights Reserved.
47+# Pedro Manuel Baeza <pedro.baeza@gmail.com>
48+# Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
49+# Ignacio Ibeas <ignacio@acysos.com>
50+# $Id$
51+#
52+# This program is free software: you can redistribute it and/or modify
53+# it under the terms of the GNU General Public License as published by
54+# the Free Software Foundation, either version 3 of the License, or
55+# (at your option) any later version.
56+#
57+# This program is distributed in the hope that it will be useful,
58+# but WITHOUT ANY WARRANTY; without even the implied warranty of
59+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
60+# GNU General Public License for more details.
61+#
62+# You should have received a copy of the GNU General Public License
63+# along with this program. If not, see <http://www.gnu.org/licenses/>.
64+#
65+##############################################################################
66+{
67+ "name" : "City-Helps to keep Homogeneous address data in the Database",
68+ "version" : "2.0",
69+ "author" : "Acysos S.L., Pedro Manuel Baeza, Pablo Rocandio",
70+ "license" : "AGPL-3",
71+ "category" : "Hidden",
72+ "description": """Creates a model for storing cities
73+Zip code, city, state and country fields are replaced with a location field in partner and partner contact forms.
74+This module helps to keep homogeneous address data in the database.""",
75+ "depends" : ["base"],
76+ "init_xml" : [],
77+ "update_xml" : [
78+ 'city_view.xml',
79+ 'partner_view.xml',
80+ 'country_view.xml',
81+ 'security/ir.model.access.csv'
82+ ],
83+ "active": False,
84+ "installable": True
85+}
86
87=== added file 'city/city.py'
88--- city/city.py 1970-01-01 00:00:00 +0000
89+++ city/city.py 2013-05-13 09:06:50 +0000
90@@ -0,0 +1,70 @@
91+# -*- encoding: utf-8 -*-
92+##############################################################################
93+#
94+# OpenERP, Open Source Management Solution
95+# Copyright (c) 2013 Servicios Baeza (http://www.serviciosbaeza.com/) All Rights Reserved.
96+# Pedro Manuel Baeza <pedro.baeza@gmail.com>
97+# Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
98+# Ignacio Ibeas <ignacio@acysos.com>
99+# $Id$
100+#
101+# This program is free software: you can redistribute it and/or modify
102+# it under the terms of the GNU General Public License as published by
103+# the Free Software Foundation, either version 3 of the License, or
104+# (at your option) any later version.
105+#
106+# This program is distributed in the hope that it will be useful,
107+# but WITHOUT ANY WARRANTY; without even the implied warranty of
108+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
109+# GNU General Public License for more details.
110+#
111+# You should have received a copy of the GNU General Public License
112+# along with this program. If not, see <http://www.gnu.org/licenses/>.
113+#
114+##############################################################################
115+
116+from osv import osv, fields
117+import wizard
118+import pooler
119+
120+class city(osv.osv):
121+
122+ def name_get(self, cr, uid, ids, context=None):
123+ if not len(ids):
124+ return []
125+ res = []
126+ for line in self.browse(cr, uid, ids, context=context):
127+ name = line.name
128+ if line.zip:
129+ name = "%s %s" % (line.zip, name)
130+ if line.state_id:
131+ name = "%s, %s" % (name, line.state_id.name)
132+ if line.country_id:
133+ name = "%s, %s" % (name, line.country_id.name)
134+ res.append((line['id'], name))
135+ return res
136+
137+ def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
138+ if args is None:
139+ args = []
140+ if context is None:
141+ context = {}
142+ ids = []
143+ if name:
144+ ids = self.search(cr, uid, [('zip', 'ilike', name)]+ args, limit=limit)
145+ if not ids:
146+ ids = self.search(cr, uid, [('name', operator, name)]+ args, limit=limit)
147+ return self.name_get(cr, uid, ids, context=context)
148+
149+ _name = 'city.city'
150+ _description = 'City'
151+ _columns = {
152+ 'state_id': fields.many2one('res.country.state', 'State',
153+ domain="[('country_id','=',country_id)]", select=1),
154+ 'name': fields.char('City', size=64, required=True, select=1),
155+ 'zip': fields.char('ZIP', size=64, required=True, select=1),
156+ 'country_id': fields.many2one('res.country', 'Country', select=1),
157+ 'code': fields.char('City Code', size=64,
158+ help="The official code for the city"),
159+ }
160+city()
161
162=== added file 'city/city_view.xml'
163--- city/city_view.xml 1970-01-01 00:00:00 +0000
164+++ city/city_view.xml 2013-05-13 09:06:50 +0000
165@@ -0,0 +1,45 @@
166+<?xml version="1.0"?>
167+<openerp>
168+ <data>
169+
170+ <!-- City -->
171+ <record model="ir.ui.view" id="view_city_tree">
172+ <field name="name">city.city.tree</field>
173+ <field name="model">city.city</field>
174+ <field name="type">tree</field>
175+ <field name="arch" type="xml">
176+ <tree string="City">
177+ <field name="zip"/>
178+ <field name="name"/>
179+ <field name="state_id"/>
180+ <field name="country_id"/>
181+ </tree>
182+ </field>
183+ </record>
184+
185+ <record model="ir.ui.view" id="view_city_form">
186+ <field name="name">city.city.form</field>
187+ <field name="model">city.city</field>
188+ <field name="type">form</field>
189+ <field name="arch" type="xml">
190+ <form string="City">
191+ <field name="zip" select="1"/>
192+ <field name="name" select="1"/>
193+ <field name="country_id" />
194+ <field name="state_id" select="1"/>
195+ <field name="code" select="2"/>
196+ </form>
197+ </field>
198+ </record>
199+
200+ <record model="ir.actions.act_window" id="action_city">
201+ <field name="name">City</field>
202+ <field name="type">ir.actions.act_window</field>
203+ <field name="res_model">city.city</field>
204+ <field name="view_type">form</field>
205+ </record>
206+
207+ <menuitem name="Cities" groups="base.group_system" action="action_city" parent="base.menu_localisation" id="menu_city_partner"/>
208+
209+ </data>
210+</openerp>
211
212=== added file 'city/country.py'
213--- city/country.py 1970-01-01 00:00:00 +0000
214+++ city/country.py 2013-05-13 09:06:50 +0000
215@@ -0,0 +1,35 @@
216+# -*- encoding: utf-8 -*-
217+##############################################################################
218+#
219+# OpenERP, Open Source Management Solution
220+# Copyright (c) 2013 Servicios Baeza (http://www.serviciosbaeza.com/) All Rights Reserved.
221+# Pedro Manuel Baeza <pedro.baeza@gmail.com>
222+# Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
223+# Ignacio Ibeas <ignacio@acysos.com>
224+# $Id$
225+#
226+# This program is free software: you can redistribute it and/or modify
227+# it under the terms of the GNU General Public License as published by
228+# the Free Software Foundation, either version 3 of the License, or
229+# (at your option) any later version.
230+#
231+# This program is distributed in the hope that it will be useful,
232+# but WITHOUT ANY WARRANTY; without even the implied warranty of
233+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
234+# GNU General Public License for more details.
235+#
236+# You should have received a copy of the GNU General Public License
237+# along with this program. If not, see <http://www.gnu.org/licenses/>.
238+#
239+##############################################################################
240+
241+from osv import osv, fields
242+import wizard
243+import pooler
244+
245+class CountryState(osv.osv):
246+ _inherit = 'res.country.state'
247+ _columns = {
248+ 'city_ids': fields.one2many('city.city', 'state_id', 'Cities'),
249+ }
250+CountryState()
251\ No newline at end of file
252
253=== added file 'city/country_view.xml'
254--- city/country_view.xml 1970-01-01 00:00:00 +0000
255+++ city/country_view.xml 2013-05-13 09:06:50 +0000
256@@ -0,0 +1,16 @@
257+<?xml version="1.0"?>
258+<openerp>
259+ <data>
260+ <!-- Add cities to the State form -->
261+ <record model="ir.ui.view" id="view_country_state_form2">
262+ <field name="name">view_country_state_form2</field>
263+ <field name="model">res.country.state</field>
264+ <field name="inherit_id" ref="base.view_country_state_form"/>
265+ <field name="arch" type="xml">
266+ <field name="code" position="after">
267+ <field name="city_ids" colspan="4" nolabel="1" widget="one2many_list"/>
268+ </field>
269+ </field>
270+ </record>
271+ </data>
272+</openerp>
273\ No newline at end of file
274
275=== added directory 'city/i18n'
276=== added file 'city/i18n/bg.po'
277--- city/i18n/bg.po 1970-01-01 00:00:00 +0000
278+++ city/i18n/bg.po 2013-05-13 09:06:50 +0000
279@@ -0,0 +1,88 @@
280+# Bulgarian translation for openobject-addons
281+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
282+# This file is distributed under the same license as the openobject-addons package.
283+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
284+#
285+msgid ""
286+msgstr ""
287+"Project-Id-Version: openobject-addons\n"
288+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
289+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
290+"PO-Revision-Date: 2011-02-26 10:06+0000\n"
291+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
292+"Language-Team: Bulgarian <bg@li.org>\n"
293+"MIME-Version: 1.0\n"
294+"Content-Type: text/plain; charset=UTF-8\n"
295+"Content-Transfer-Encoding: 8bit\n"
296+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
297+"X-Generator: Launchpad (build 16218)\n"
298+
299+#. module: city
300+#: view:city.city:0
301+#: model:ir.actions.act_window,name:city.action_city
302+#: model:ir.model,name:city.model_city_city
303+#: model:ir.module.module,shortdesc:city.module_meta_information
304+msgid "City"
305+msgstr "Град"
306+
307+#. module: city
308+#: constraint:ir.ui.view:0
309+msgid "Invalid XML for View Architecture!"
310+msgstr ""
311+
312+#. module: city
313+#: constraint:ir.model:0
314+msgid ""
315+"The Object name must start with x_ and not contain any special character !"
316+msgstr ""
317+"Името на обекта трябва да започва с x_ и не може да никакви специални знаци !"
318+
319+#. module: city
320+#: field:city.city,zip:0
321+msgid "ZIP"
322+msgstr ""
323+
324+#. module: city
325+#: field:city.city,state_id:0
326+msgid "State"
327+msgstr "Област"
328+
329+#. module: city
330+#: field:city.city,country_id:0
331+msgid "Country"
332+msgstr "Държава"
333+
334+#. module: city
335+#: field:city.city,code:0
336+msgid "City Code"
337+msgstr "Код на града"
338+
339+#. module: city
340+#: model:ir.module.module,description:city.module_meta_information
341+msgid ""
342+"Creates a model for storing cities\n"
343+"Zip code, city, state and country fields are replaced with a location field "
344+"in partner and partner contact forms.\n"
345+"This module helps to keep homogeneous address data in the database."
346+msgstr ""
347+
348+#. module: city
349+#: field:city.city,name:0
350+msgid "City Name"
351+msgstr "Име на град"
352+
353+#. module: city
354+#: field:res.partner.address,city_id:0
355+msgid "Location"
356+msgstr "Местоположение"
357+
358+#. module: city
359+#: help:city.city,code:0
360+msgid "The official code for the city"
361+msgstr ""
362+
363+#. module: city
364+#: model:ir.ui.menu,name:city.menu_city_partner
365+#: field:res.country.state,city_ids:0
366+msgid "Cities"
367+msgstr "Градове"
368
369=== added file 'city/i18n/ca.po'
370--- city/i18n/ca.po 1970-01-01 00:00:00 +0000
371+++ city/i18n/ca.po 2013-05-13 09:06:50 +0000
372@@ -0,0 +1,94 @@
373+# Translation of OpenERP Server.
374+# This file containt the translation of the following modules:
375+# * city
376+#
377+msgid ""
378+msgstr ""
379+"Project-Id-Version: OpenERP Server 5.0.0-alpha\n"
380+"Report-Msgid-Bugs-To: support@openerp.com\n"
381+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
382+"PO-Revision-Date: 2010-01-19 05:17+0000\n"
383+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
384+"<jesteve@zikzakmedia.com>\n"
385+"Language-Team: \n"
386+"MIME-Version: 1.0\n"
387+"Content-Type: text/plain; charset=UTF-8\n"
388+"Content-Transfer-Encoding: 8bit\n"
389+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
390+"X-Generator: Launchpad (build 16218)\n"
391+
392+#. module: city
393+#: view:city.city:0
394+#: model:ir.actions.act_window,name:city.action_city
395+#: model:ir.model,name:city.model_city_city
396+#: model:ir.module.module,shortdesc:city.module_meta_information
397+msgid "City"
398+msgstr "Ciutat"
399+
400+#. module: city
401+#: constraint:ir.ui.view:0
402+msgid "Invalid XML for View Architecture!"
403+msgstr "XML no vàlid per a la definició de la vista!"
404+
405+#. module: city
406+#: constraint:ir.model:0
407+msgid ""
408+"The Object name must start with x_ and not contain any special character !"
409+msgstr ""
410+"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
411+"especial !"
412+
413+#. module: city
414+#: field:city.city,zip:0
415+msgid "ZIP"
416+msgstr "Codi postal"
417+
418+#. module: city
419+#: field:city.city,state_id:0
420+msgid "State"
421+msgstr "Província"
422+
423+#. module: city
424+#: field:city.city,country_id:0
425+msgid "Country"
426+msgstr "País"
427+
428+#. module: city
429+#: field:city.city,code:0
430+msgid "City Code"
431+msgstr "Codi de ciutat"
432+
433+#. module: city
434+#: model:ir.module.module,description:city.module_meta_information
435+msgid ""
436+"Creates a model for storing cities\n"
437+"Zip code, city, state and country fields are replaced with a location field "
438+"in partner and partner contact forms.\n"
439+"This module helps to keep homogeneous address data in the database."
440+msgstr ""
441+"Crea un model per emmagatzemar ciutats.\n"
442+"Els camps de codi postal, província i país són reemplaçats amb un camp de "
443+"localització en els formularis d'empresa i contacte/adreça d'empresa.\n"
444+"Aquest mòdul ajuda a mantenir informació homogènia d'adreces a la base de "
445+"dades."
446+
447+#. module: city
448+#: field:city.city,name:0
449+msgid "City Name"
450+msgstr "Nom de la ciutat"
451+
452+#. module: city
453+#: field:res.partner.address,city_id:0
454+msgid "Location"
455+msgstr "Ubicació"
456+
457+#. module: city
458+#: help:city.city,code:0
459+msgid "The official code for the city"
460+msgstr "El codi oficial de la ciutat."
461+
462+#. module: city
463+#: model:ir.ui.menu,name:city.menu_city_partner
464+#: field:res.country.state,city_ids:0
465+msgid "Cities"
466+msgstr "Ciutats"
467
468=== added file 'city/i18n/city.pot'
469--- city/i18n/city.pot 1970-01-01 00:00:00 +0000
470+++ city/i18n/city.pot 2013-05-13 09:06:50 +0000
471@@ -0,0 +1,76 @@
472+# Translation of OpenERP Server.
473+# This file contains the translation of the following modules:
474+# * city
475+#
476+msgid ""
477+msgstr ""
478+"Project-Id-Version: OpenERP Server 6.0.4\n"
479+"Report-Msgid-Bugs-To: support@openerp.com\n"
480+"POT-Creation-Date: 2013-04-30 12:00+0000\n"
481+"PO-Revision-Date: 2013-04-30 12:00+0000\n"
482+"Last-Translator: <>\n"
483+"Language-Team: \n"
484+"MIME-Version: 1.0\n"
485+"Content-Type: text/plain; charset=UTF-8\n"
486+"Content-Transfer-Encoding: \n"
487+"Plural-Forms: \n"
488+
489+#. module: city
490+#: view:city.city:0
491+#: field:city.city,name:0
492+#: model:ir.actions.act_window,name:city.action_city
493+#: model:ir.model,name:city.model_city_city
494+msgid "City"
495+msgstr ""
496+
497+#. module: city
498+#: model:ir.model,name:city.model_res_partner_address
499+msgid "Partner Addresses"
500+msgstr ""
501+
502+#. module: city
503+#: field:city.city,zip:0
504+msgid "ZIP"
505+msgstr ""
506+
507+#. module: city
508+#: field:city.city,country_id:0
509+msgid "Country"
510+msgstr ""
511+
512+#. module: city
513+#: help:res.partner.address,location:0
514+msgid "Use the name or the zip to search the location"
515+msgstr ""
516+
517+#. module: city
518+#: field:city.city,code:0
519+msgid "City Code"
520+msgstr ""
521+
522+#. module: city
523+#: field:city.city,state_id:0
524+msgid "State"
525+msgstr ""
526+
527+#. module: city
528+#: field:res.partner.address,location:0
529+msgid "Location"
530+msgstr ""
531+
532+#. module: city
533+#: help:city.city,code:0
534+msgid "The official code for the city"
535+msgstr ""
536+
537+#. module: city
538+#: model:ir.ui.menu,name:city.menu_city_partner
539+#: field:res.country.state,city_ids:0
540+msgid "Cities"
541+msgstr ""
542+
543+#. module: city
544+#: model:ir.model,name:city.model_res_country_state
545+msgid "Country state"
546+msgstr ""
547+
548
549=== added file 'city/i18n/es.po'
550--- city/i18n/es.po 1970-01-01 00:00:00 +0000
551+++ city/i18n/es.po 2013-05-13 09:06:50 +0000
552@@ -0,0 +1,76 @@
553+# Translation of OpenERP Server.
554+# This file contains the translation of the following modules:
555+# * city
556+#
557+msgid ""
558+msgstr ""
559+"Project-Id-Version: OpenERP Server 6.0.4\n"
560+"Report-Msgid-Bugs-To: support@openerp.com\n"
561+"POT-Creation-Date: 2013-04-30 12:01+0000\n"
562+"PO-Revision-Date: 2013-04-30 12:01+0000\n"
563+"Last-Translator: <>\n"
564+"Language-Team: \n"
565+"MIME-Version: 1.0\n"
566+"Content-Type: text/plain; charset=UTF-8\n"
567+"Content-Transfer-Encoding: \n"
568+"Plural-Forms: \n"
569+
570+#. module: city
571+#: view:city.city:0
572+#: field:city.city,name:0
573+#: model:ir.actions.act_window,name:city.action_city
574+#: model:ir.model,name:city.model_city_city
575+msgid "City"
576+msgstr "Ciudad"
577+
578+#. module: city
579+#: model:ir.model,name:city.model_res_partner_address
580+msgid "Partner Addresses"
581+msgstr "Direcciones de empresa"
582+
583+#. module: city
584+#: field:city.city,zip:0
585+msgid "ZIP"
586+msgstr "Código postal"
587+
588+#. module: city
589+#: field:city.city,country_id:0
590+msgid "Country"
591+msgstr "País"
592+
593+#. module: city
594+#: help:res.partner.address,location:0
595+msgid "Use the name or the zip to search the location"
596+msgstr "Utilice el nombre o el código postal para buscar la localización"
597+
598+#. module: city
599+#: field:city.city,code:0
600+msgid "City Code"
601+msgstr "Código de ciudad"
602+
603+#. module: city
604+#: field:city.city,state_id:0
605+msgid "State"
606+msgstr "Provincia"
607+
608+#. module: city
609+#: field:res.partner.address,location:0
610+msgid "Location"
611+msgstr "Location"
612+
613+#. module: city
614+#: help:city.city,code:0
615+msgid "The official code for the city"
616+msgstr "Código oficial de la ciudad."
617+
618+#. module: city
619+#: model:ir.ui.menu,name:city.menu_city_partner
620+#: field:res.country.state,city_ids:0
621+msgid "Cities"
622+msgstr "Ciudades"
623+
624+#. module: city
625+#: model:ir.model,name:city.model_res_country_state
626+msgid "Country state"
627+msgstr "Provincia"
628+
629
630=== added file 'city/i18n/fi.po'
631--- city/i18n/fi.po 1970-01-01 00:00:00 +0000
632+++ city/i18n/fi.po 2013-05-13 09:06:50 +0000
633@@ -0,0 +1,88 @@
634+# Finnish translation for openobject-addons
635+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
636+# This file is distributed under the same license as the openobject-addons package.
637+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
638+#
639+msgid ""
640+msgstr ""
641+"Project-Id-Version: openobject-addons\n"
642+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
643+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
644+"PO-Revision-Date: 2011-06-28 06:58+0000\n"
645+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
646+"Language-Team: Finnish <fi@li.org>\n"
647+"MIME-Version: 1.0\n"
648+"Content-Type: text/plain; charset=UTF-8\n"
649+"Content-Transfer-Encoding: 8bit\n"
650+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
651+"X-Generator: Launchpad (build 16218)\n"
652+
653+#. module: city
654+#: view:city.city:0
655+#: model:ir.actions.act_window,name:city.action_city
656+#: model:ir.model,name:city.model_city_city
657+#: model:ir.module.module,shortdesc:city.module_meta_information
658+msgid "City"
659+msgstr "Kaupunki"
660+
661+#. module: city
662+#: constraint:ir.ui.view:0
663+msgid "Invalid XML for View Architecture!"
664+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
665+
666+#. module: city
667+#: constraint:ir.model:0
668+msgid ""
669+"The Object name must start with x_ and not contain any special character !"
670+msgstr ""
671+"Objektin nimi täytyy alkaa X_ eikä se saa sisältää mitää erikoismerkkejä!"
672+
673+#. module: city
674+#: field:city.city,zip:0
675+msgid "ZIP"
676+msgstr "Postinumero"
677+
678+#. module: city
679+#: field:city.city,state_id:0
680+msgid "State"
681+msgstr "Osavaltio"
682+
683+#. module: city
684+#: field:city.city,country_id:0
685+msgid "Country"
686+msgstr "Maa"
687+
688+#. module: city
689+#: field:city.city,code:0
690+msgid "City Code"
691+msgstr "Maakoodi"
692+
693+#. module: city
694+#: model:ir.module.module,description:city.module_meta_information
695+msgid ""
696+"Creates a model for storing cities\n"
697+"Zip code, city, state and country fields are replaced with a location field "
698+"in partner and partner contact forms.\n"
699+"This module helps to keep homogeneous address data in the database."
700+msgstr ""
701+
702+#. module: city
703+#: field:city.city,name:0
704+msgid "City Name"
705+msgstr "Kaupungin nimi"
706+
707+#. module: city
708+#: field:res.partner.address,city_id:0
709+msgid "Location"
710+msgstr "Sijainti"
711+
712+#. module: city
713+#: help:city.city,code:0
714+msgid "The official code for the city"
715+msgstr "Kaupungin viralinen koodi"
716+
717+#. module: city
718+#: model:ir.ui.menu,name:city.menu_city_partner
719+#: field:res.country.state,city_ids:0
720+msgid "Cities"
721+msgstr "Kaupungit"
722
723=== added file 'city/i18n/fr.po'
724--- city/i18n/fr.po 1970-01-01 00:00:00 +0000
725+++ city/i18n/fr.po 2013-05-13 09:06:50 +0000
726@@ -0,0 +1,93 @@
727+# Translation of OpenERP Server.
728+# This file contains the translation of the following modules:
729+# * city
730+#
731+msgid ""
732+msgstr ""
733+"Project-Id-Version: OpenERP Server 5.0.0\n"
734+"Report-Msgid-Bugs-To: support@openerp.com\n"
735+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
736+"PO-Revision-Date: 2010-01-19 05:16+0000\n"
737+"Last-Translator: Numérigraphe <Unknown>\n"
738+"Language-Team: \n"
739+"MIME-Version: 1.0\n"
740+"Content-Type: text/plain; charset=UTF-8\n"
741+"Content-Transfer-Encoding: 8bit\n"
742+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
743+"X-Generator: Launchpad (build 16218)\n"
744+
745+#. module: city
746+#: view:city.city:0
747+#: model:ir.actions.act_window,name:city.action_city
748+#: model:ir.model,name:city.model_city_city
749+#: model:ir.module.module,shortdesc:city.module_meta_information
750+msgid "City"
751+msgstr "Ville"
752+
753+#. module: city
754+#: constraint:ir.ui.view:0
755+msgid "Invalid XML for View Architecture!"
756+msgstr "XML non valide pour l'architecture de la vue"
757+
758+#. module: city
759+#: constraint:ir.model:0
760+msgid ""
761+"The Object name must start with x_ and not contain any special character !"
762+msgstr ""
763+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
764+"spéciaux !"
765+
766+#. module: city
767+#: field:city.city,zip:0
768+msgid "ZIP"
769+msgstr "Code postal"
770+
771+#. module: city
772+#: field:city.city,state_id:0
773+msgid "State"
774+msgstr "État"
775+
776+#. module: city
777+#: field:city.city,country_id:0
778+msgid "Country"
779+msgstr "Pays"
780+
781+#. module: city
782+#: field:city.city,code:0
783+msgid "City Code"
784+msgstr "Code de la ville"
785+
786+#. module: city
787+#: model:ir.module.module,description:city.module_meta_information
788+msgid ""
789+"Creates a model for storing cities\n"
790+"Zip code, city, state and country fields are replaced with a location field "
791+"in partner and partner contact forms.\n"
792+"This module helps to keep homogeneous address data in the database."
793+msgstr ""
794+"Crée un modèle de données pour les villes.\n"
795+"Les champs \"code postal\", \"ville\", \"état\" et \"pays\" sont remplacés "
796+"par un champ \"localisation\" dans les formulaires \"partenaire\" et "
797+"\"contacts du partenaire\".Ce module permet de conserver des données "
798+"d'adresse homogènes."
799+
800+#. module: city
801+#: field:city.city,name:0
802+msgid "City Name"
803+msgstr "Nom de la ville"
804+
805+#. module: city
806+#: field:res.partner.address,city_id:0
807+msgid "Location"
808+msgstr "Localisation"
809+
810+#. module: city
811+#: help:city.city,code:0
812+msgid "The official code for the city"
813+msgstr "Le code officiel de la ville"
814+
815+#. module: city
816+#: model:ir.ui.menu,name:city.menu_city_partner
817+#: field:res.country.state,city_ids:0
818+msgid "Cities"
819+msgstr "Villes"
820
821=== added file 'city/i18n/fr_BE.po'
822--- city/i18n/fr_BE.po 1970-01-01 00:00:00 +0000
823+++ city/i18n/fr_BE.po 2013-05-13 09:06:50 +0000
824@@ -0,0 +1,85 @@
825+# Translation of OpenERP Server.
826+# This file contains the translation of the following modules:
827+# * city
828+#
829+msgid ""
830+msgstr ""
831+"Project-Id-Version: OpenERP Server 5.0.0\n"
832+"Report-Msgid-Bugs-To: support@openerp.com\n"
833+"POT-Creation-Date: 2009-02-27 09:13:15+0000\n"
834+"PO-Revision-Date: 2009-02-27 10:22+0100\n"
835+"Last-Translator: Numerigraphe <informatique@numerigraphe.com>\n"
836+"Language-Team: \n"
837+"MIME-Version: 1.0\n"
838+"Content-Type: text/plain; charset=UTF-8\n"
839+"Content-Transfer-Encoding: \n"
840+"Plural-Forms: "
841+
842+#. module: city
843+#: view:city.city:0
844+#: model:ir.actions.act_window,name:city.action_city
845+#: model:ir.model,name:city.model_city_city
846+#: model:ir.module.module,shortdesc:city.module_meta_information
847+msgid "City"
848+msgstr "Ville"
849+
850+#. module: city
851+#: constraint:ir.ui.view:0
852+msgid "Invalid XML for View Architecture!"
853+msgstr "XML non valide pour l'architecture de la vue"
854+
855+#. module: city
856+#: constraint:ir.model:0
857+msgid "The Object name must start with x_ and not contain any special character !"
858+msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
859+
860+#. module: city
861+#: field:city.city,zip:0
862+msgid "ZIP"
863+msgstr "Code postal"
864+
865+#. module: city
866+#: field:city.city,state_id:0
867+msgid "State"
868+msgstr "État"
869+
870+#. module: city
871+#: field:city.city,country_id:0
872+msgid "Country"
873+msgstr "Pays"
874+
875+#. module: city
876+#: field:city.city,code:0
877+msgid "City Code"
878+msgstr "Code de la ville"
879+
880+#. module: city
881+#: model:ir.module.module,description:city.module_meta_information
882+msgid "Creates a model for storing cities\n"
883+"Zip code, city, state and country fields are replaced with a location field in partner and partner contact forms.\n"
884+"This module helps to keep homogeneous address data in the database."
885+msgstr "Crée un modèle de données pour les villes.\n"
886+"Les champs \"code postal\", \"ville\", \"état\" et \"pays\" sont remplacés par un champ \"localisation\" dans les formulaires \"partenaire\" et \"contacts du partenaire\"."
887+"Ce module permet de conserver des données d'adresse homogènes."
888+
889+#. module: city
890+#: field:city.city,name:0
891+msgid "City Name"
892+msgstr "Nom de la ville"
893+
894+#. module: city
895+#: field:res.partner.address,city_id:0
896+msgid "Location"
897+msgstr "Localisation"
898+
899+#. module: city
900+#: help:city.city,code:0
901+msgid "The official code for the city"
902+msgstr "Le code officiel de la ville"
903+
904+#. module: city
905+#: model:ir.ui.menu,name:city.menu_city_partner
906+#: field:res.country.state,city_ids:0
907+msgid "Cities"
908+msgstr "Villes"
909+
910
911=== added file 'city/i18n/ru.po'
912--- city/i18n/ru.po 1970-01-01 00:00:00 +0000
913+++ city/i18n/ru.po 2013-05-13 09:06:50 +0000
914@@ -0,0 +1,89 @@
915+# Russian translation for openobject-addons
916+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
917+# This file is distributed under the same license as the openobject-addons package.
918+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
919+#
920+msgid ""
921+msgstr ""
922+"Project-Id-Version: openobject-addons\n"
923+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
924+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
925+"PO-Revision-Date: 2011-03-30 17:03+0000\n"
926+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
927+"Language-Team: Russian <ru@li.org>\n"
928+"MIME-Version: 1.0\n"
929+"Content-Type: text/plain; charset=UTF-8\n"
930+"Content-Transfer-Encoding: 8bit\n"
931+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
932+"X-Generator: Launchpad (build 16218)\n"
933+
934+#. module: city
935+#: view:city.city:0
936+#: model:ir.actions.act_window,name:city.action_city
937+#: model:ir.model,name:city.model_city_city
938+#: model:ir.module.module,shortdesc:city.module_meta_information
939+msgid "City"
940+msgstr "Город"
941+
942+#. module: city
943+#: constraint:ir.ui.view:0
944+msgid "Invalid XML for View Architecture!"
945+msgstr "Неправильный XML для просмотра структуры!"
946+
947+#. module: city
948+#: constraint:ir.model:0
949+msgid ""
950+"The Object name must start with x_ and not contain any special character !"
951+msgstr ""
952+"Имя Объекта должно начинаться с x_ и не должно содержать специальных "
953+"символов!"
954+
955+#. module: city
956+#: field:city.city,zip:0
957+msgid "ZIP"
958+msgstr "Почтовый индекс"
959+
960+#. module: city
961+#: field:city.city,state_id:0
962+msgid "State"
963+msgstr "Область/штат"
964+
965+#. module: city
966+#: field:city.city,country_id:0
967+msgid "Country"
968+msgstr "Страна"
969+
970+#. module: city
971+#: field:city.city,code:0
972+msgid "City Code"
973+msgstr "Код города"
974+
975+#. module: city
976+#: model:ir.module.module,description:city.module_meta_information
977+msgid ""
978+"Creates a model for storing cities\n"
979+"Zip code, city, state and country fields are replaced with a location field "
980+"in partner and partner contact forms.\n"
981+"This module helps to keep homogeneous address data in the database."
982+msgstr ""
983+
984+#. module: city
985+#: field:city.city,name:0
986+msgid "City Name"
987+msgstr "Название города"
988+
989+#. module: city
990+#: field:res.partner.address,city_id:0
991+msgid "Location"
992+msgstr "Расположение"
993+
994+#. module: city
995+#: help:city.city,code:0
996+msgid "The official code for the city"
997+msgstr "Официальный код для города"
998+
999+#. module: city
1000+#: model:ir.ui.menu,name:city.menu_city_partner
1001+#: field:res.country.state,city_ids:0
1002+msgid "Cities"
1003+msgstr "Города"
1004
1005=== added file 'city/i18n/sv.po'
1006--- city/i18n/sv.po 1970-01-01 00:00:00 +0000
1007+++ city/i18n/sv.po 2013-05-13 09:06:50 +0000
1008@@ -0,0 +1,86 @@
1009+# Translation of OpenERP Server.
1010+# This file contains the translation of the following modules:
1011+# * city
1012+#
1013+msgid ""
1014+msgstr ""
1015+"Project-Id-Version: OpenERP Server 5.0.14\n"
1016+"Report-Msgid-Bugs-To: support@openerp.com\n"
1017+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
1018+"PO-Revision-Date: 2011-01-14 14:52+0000\n"
1019+"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
1020+"Language-Team: \n"
1021+"MIME-Version: 1.0\n"
1022+"Content-Type: text/plain; charset=UTF-8\n"
1023+"Content-Transfer-Encoding: 8bit\n"
1024+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
1025+"X-Generator: Launchpad (build 16218)\n"
1026+
1027+#. module: city
1028+#: view:city.city:0
1029+#: model:ir.actions.act_window,name:city.action_city
1030+#: model:ir.model,name:city.model_city_city
1031+#: model:ir.module.module,shortdesc:city.module_meta_information
1032+msgid "City"
1033+msgstr "Stad"
1034+
1035+#. module: city
1036+#: constraint:ir.ui.view:0
1037+msgid "Invalid XML for View Architecture!"
1038+msgstr "Ogiltig XML för Vy-arkitektur!"
1039+
1040+#. module: city
1041+#: constraint:ir.model:0
1042+msgid ""
1043+"The Object name must start with x_ and not contain any special character !"
1044+msgstr ""
1045+
1046+#. module: city
1047+#: field:city.city,zip:0
1048+msgid "ZIP"
1049+msgstr "Postnummer"
1050+
1051+#. module: city
1052+#: field:city.city,state_id:0
1053+msgid "State"
1054+msgstr ""
1055+
1056+#. module: city
1057+#: field:city.city,country_id:0
1058+msgid "Country"
1059+msgstr "Land"
1060+
1061+#. module: city
1062+#: field:city.city,code:0
1063+msgid "City Code"
1064+msgstr ""
1065+
1066+#. module: city
1067+#: model:ir.module.module,description:city.module_meta_information
1068+msgid ""
1069+"Creates a model for storing cities\n"
1070+"Zip code, city, state and country fields are replaced with a location field "
1071+"in partner and partner contact forms.\n"
1072+"This module helps to keep homogeneous address data in the database."
1073+msgstr ""
1074+
1075+#. module: city
1076+#: field:city.city,name:0
1077+msgid "City Name"
1078+msgstr "Stadens namn"
1079+
1080+#. module: city
1081+#: field:res.partner.address,city_id:0
1082+msgid "Location"
1083+msgstr "Plats"
1084+
1085+#. module: city
1086+#: help:city.city,code:0
1087+msgid "The official code for the city"
1088+msgstr ""
1089+
1090+#. module: city
1091+#: model:ir.ui.menu,name:city.menu_city_partner
1092+#: field:res.country.state,city_ids:0
1093+msgid "Cities"
1094+msgstr "Städer"
1095
1096=== added file 'city/i18n/vi.po'
1097--- city/i18n/vi.po 1970-01-01 00:00:00 +0000
1098+++ city/i18n/vi.po 2013-05-13 09:06:50 +0000
1099@@ -0,0 +1,89 @@
1100+# Vietnamese translation for openobject-addons
1101+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
1102+# This file is distributed under the same license as the openobject-addons package.
1103+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
1104+#
1105+msgid ""
1106+msgstr ""
1107+"Project-Id-Version: openobject-addons\n"
1108+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1109+"POT-Creation-Date: 2009-02-27 09:13+0000\n"
1110+"PO-Revision-Date: 2011-03-28 15:42+0000\n"
1111+"Last-Translator: OpenBMS JSC <Unknown>\n"
1112+"Language-Team: Vietnamese <vi@li.org>\n"
1113+"MIME-Version: 1.0\n"
1114+"Content-Type: text/plain; charset=UTF-8\n"
1115+"Content-Transfer-Encoding: 8bit\n"
1116+"X-Launchpad-Export-Date: 2012-10-31 04:47+0000\n"
1117+"X-Generator: Launchpad (build 16218)\n"
1118+
1119+#. module: city
1120+#: view:city.city:0
1121+#: model:ir.actions.act_window,name:city.action_city
1122+#: model:ir.model,name:city.model_city_city
1123+#: model:ir.module.module,shortdesc:city.module_meta_information
1124+msgid "City"
1125+msgstr "Thành phố/Quận"
1126+
1127+#. module: city
1128+#: constraint:ir.ui.view:0
1129+msgid "Invalid XML for View Architecture!"
1130+msgstr "XML không hợp lệ cho Kiến trúc Xem!"
1131+
1132+#. module: city
1133+#: constraint:ir.model:0
1134+msgid ""
1135+"The Object name must start with x_ and not contain any special character !"
1136+msgstr ""
1137+"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 "
1138+"nào!"
1139+
1140+#. module: city
1141+#: field:city.city,zip:0
1142+msgid "ZIP"
1143+msgstr "Mã bưu chính"
1144+
1145+#. module: city
1146+#: field:city.city,state_id:0
1147+msgid "State"
1148+msgstr "Tiểu bang"
1149+
1150+#. module: city
1151+#: field:city.city,country_id:0
1152+msgid "Country"
1153+msgstr "Quốc gia"
1154+
1155+#. module: city
1156+#: field:city.city,code:0
1157+msgid "City Code"
1158+msgstr "Mã Thành phố"
1159+
1160+#. module: city
1161+#: model:ir.module.module,description:city.module_meta_information
1162+msgid ""
1163+"Creates a model for storing cities\n"
1164+"Zip code, city, state and country fields are replaced with a location field "
1165+"in partner and partner contact forms.\n"
1166+"This module helps to keep homogeneous address data in the database."
1167+msgstr ""
1168+
1169+#. module: city
1170+#: field:city.city,name:0
1171+msgid "City Name"
1172+msgstr "Tên Thành phố"
1173+
1174+#. module: city
1175+#: field:res.partner.address,city_id:0
1176+msgid "Location"
1177+msgstr "Địa điểm"
1178+
1179+#. module: city
1180+#: help:city.city,code:0
1181+msgid "The official code for the city"
1182+msgstr "Mã chính thức của thành phố"
1183+
1184+#. module: city
1185+#: model:ir.ui.menu,name:city.menu_city_partner
1186+#: field:res.country.state,city_ids:0
1187+msgid "Cities"
1188+msgstr "Các thành phố"
1189
1190=== added file 'city/partner.py'
1191--- city/partner.py 1970-01-01 00:00:00 +0000
1192+++ city/partner.py 2013-05-13 09:06:50 +0000
1193@@ -0,0 +1,50 @@
1194+# -*- encoding: utf-8 -*-
1195+##############################################################################
1196+#
1197+# OpenERP, Open Source Management Solution
1198+# Copyright (c) 2013 Servicios Baeza (http://www.serviciosbaeza.com/) All Rights Reserved.
1199+# Pedro Manuel Baeza <pedro.baeza@gmail.com>
1200+# Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
1201+# Ignacio Ibeas <ignacio@acysos.com>
1202+# $Id$
1203+#
1204+# This program is free software: you can redistribute it and/or modify
1205+# it under the terms of the GNU General Public License as published by
1206+# the Free Software Foundation, either version 3 of the License, or
1207+# (at your option) any later version.
1208+#
1209+# This program is distributed in the hope that it will be useful,
1210+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1211+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212+# GNU General Public License for more details.
1213+#
1214+# You should have received a copy of the GNU General Public License
1215+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1216+#
1217+##############################################################################
1218+
1219+from osv import osv, fields
1220+import wizard
1221+import pooler
1222+
1223+class res_partner_address(osv.osv):
1224+ _inherit = "res.partner.address"
1225+
1226+ def on_change_city(self,cr,uid,ids,location):
1227+ result = {}
1228+ if location:
1229+ city = self.pool.get('city.city').browse(cr, uid, location)
1230+ result = {'value': {
1231+ 'zip': city.zipcode,
1232+ 'country_id': city.country_id.id,
1233+ 'city': city.name,
1234+ 'state_id': city.state_id.id
1235+ }
1236+ }
1237+ return result
1238+
1239+ _columns = {
1240+ 'city_id': fields.many2one('city.city', 'Location', select=1,
1241+ help='Use the name or the zip to search the location'),
1242+ }
1243+res_partner_address()
1244\ No newline at end of file
1245
1246=== added file 'city/partner_view.xml'
1247--- city/partner_view.xml 1970-01-01 00:00:00 +0000
1248+++ city/partner_view.xml 2013-05-13 09:06:50 +0000
1249@@ -0,0 +1,47 @@
1250+<?xml version="1.0"?>
1251+<openerp>
1252+ <data>
1253+ <!-- Add city_id to the Partner form -->
1254+ <record model="ir.ui.view" id="view_partner_form_city">
1255+ <field name="name">res.partner.form.city</field>
1256+ <field name="model">res.partner</field>
1257+ <field name="inherit_id" ref="base.view_partner_form"/>
1258+ <field name="arch" type="xml">
1259+ <data>
1260+ <xpath expr="//field[@name='address']//field[@name='street2']" position="after">
1261+ <field name="city_id" colspan="4" on_change="on_change_city(city_id)" />
1262+ </xpath>
1263+ </data>
1264+ </field>
1265+ </record>
1266+
1267+ <!-- Add city_id to the Partner Address form 1 -->
1268+ <record model="ir.ui.view" id="view_partner_address_form1_city">
1269+ <field name="name">res.partner.address.form1.city</field>
1270+ <field name="model">res.partner.address</field>
1271+ <field name="inherit_id" ref="base.view_partner_address_form1"/>
1272+ <field name="arch" type="xml">
1273+ <data>
1274+ <xpath expr="//field[@name='street2']" position="after">
1275+ <field name="city_id" on_change="on_change_city(city_id)" />
1276+ </xpath>
1277+ </data>
1278+ </field>
1279+ </record>
1280+
1281+ <!-- Add city_id to the Partner Address form 2 -->
1282+ <record model="ir.ui.view" id="view_partner_address_form2_city">
1283+ <field name="name">res.partner.address.form2.city</field>
1284+ <field name="model">res.partner.address</field>
1285+ <field name="inherit_id" ref="base.view_partner_address_form2"/>
1286+ <field name="arch" type="xml">
1287+ <data>
1288+ <xpath expr="//field[@name='street2']" position="after">
1289+ <field name="city_id" on_change="on_change_city(city_id)" />
1290+ </xpath>
1291+ </data>
1292+ </field>
1293+ </record>
1294+
1295+ </data>
1296+</openerp>
1297\ No newline at end of file
1298
1299=== added directory 'city/security'
1300=== added file 'city/security/ir.model.access.csv'
1301--- city/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
1302+++ city/security/ir.model.access.csv 2013-05-13 09:06:50 +0000
1303@@ -0,0 +1,3 @@
1304+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
1305+"access_city_city_group_all","city_city group_user_all","model_city_city",,1,0,0,0
1306+"access_city_city_group_user","city_city group_user","model_city_city","base.group_partner_manager",1,1,1,1