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

Proposed by Ignacio Ibeas (www.acysos.com) on 2013-04-30
Status: Rejected
Rejected by: Guewen Baconnier @ Camptocamp on 2013-08-30
Proposed branch: lp:~acysos-team/partner-contact-management/partner-contact-management-city-6.1
Merge into: lp:~partner-contact-core-editors/partner-contact-management/6.1
Diff against target: 1383 lines (+1269/-0)
21 files modified
city/__init__.py (+29/-0)
city/__openerp__.py (+44/-0)
city/city.py (+70/-0)
city/city_view.xml (+45/-0)
city/company.py (+49/-0)
city/company_view.xml (+17/-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/partner-contact-management/partner-contact-management-city-6.1
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp 2013-04-30 Disapprove on 2013-08-30
Numérigraphe (community) functional Disapprove on 2013-05-02
Review via email: mp+161635@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
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) wrote :
review: Resubmit (general review, untested)
Numérigraphe (numerigraphe) wrote :

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)

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.

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

[FIX] city: license added

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) wrote :

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

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.

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

> 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

> > 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

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

Subscribers

People subscribed via source and target branches

to status/vote changes: