Merge lp:~avanzosc/openerp-spain/7.0_l10n_es_partner_mercantil into lp:~openerp-spain-team/openerp-spain/7.0

Proposed by Oihane (Avanzosc)
Status: Merged
Merged at revision: 480
Proposed branch: lp:~avanzosc/openerp-spain/7.0_l10n_es_partner_mercantil
Merge into: lp:~openerp-spain-team/openerp-spain/7.0
Diff against target: 749 lines (+261/-319)
9 files modified
l10n_es_partner_mercantil/__init__.py (+3/-4)
l10n_es_partner_mercantil/__openerp__.py (+24/-28)
l10n_es_partner_mercantil/i18n/ca.po (+43/-65)
l10n_es_partner_mercantil/i18n/es.po (+43/-65)
l10n_es_partner_mercantil/i18n/gl.po (+47/-70)
l10n_es_partner_mercantil/i18n/l10n_es_partner_mercantil.pot (+40/-55)
l10n_es_partner_mercantil/models/__init__.py (+23/-0)
l10n_es_partner_mercantil/models/partner_es.py (+14/-14)
l10n_es_partner_mercantil/views/partner_es_view.xml (+24/-18)
To merge this branch: bzr merge lp:~avanzosc/openerp-spain/7.0_l10n_es_partner_mercantil
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review Approve
Review via email: mp+226326@code.launchpad.net

Description of the change

Se ha migrado a versión 7.0 el modulo l10n_es_partner_mercantil

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Buenas, Oihane, un par de cosas a solucionar:

- Haría falta actualizar el nombre del módulo (l10n_ES_partner_mercantil) para el resto de idiomas (es, ca y gl).
- La información mercantil sólo habría que mostrarla si se tiene marcada la casilla de "Es compañía" en el partner.

Gracias.

Un saludo.

review: Needs Fixing (code review)
480. By Oihane (Avanzosc)

[MOD] <l10n_es_partner_mercantil> Cambiados ficheros de traducciones y la solapa de la informacion solo se muestra cuando "es compañia" está marcado

Revision history for this message
Oihane (Avanzosc) (oihanecruce) wrote :

Cambios realizados, lo tenéis listo para review

Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Gracias por los cambios

review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed directory '___unported__/l10n_es_partner_mercantil' => 'l10n_es_partner_mercantil'
2=== modified file 'l10n_es_partner_mercantil/__init__.py'
3--- ___unported__/l10n_es_partner_mercantil/__init__.py 2011-08-29 15:11:11 +0000
4+++ l10n_es_partner_mercantil/__init__.py 2014-07-11 08:57:19 +0000
5@@ -6,8 +6,8 @@
6 # $Id$
7 #
8 # This program is free software: you can redistribute it and/or modify
9-# it under the terms of the GNU Affero General Public License as published by
10-# the Free Software Foundation, either version 3 of the License, or
11+# it under the terms of the GNU Affero General Public License as published
12+# by the Free Software Foundation, either version 3 of the License, or
13 # (at your option) any later version.
14 #
15 # This program is distributed in the hope that it will be useful,
16@@ -20,5 +20,4 @@
17 #
18 ##############################################################################
19
20-import partner_es
21-
22+from . import models
23
24=== modified file 'l10n_es_partner_mercantil/__openerp__.py'
25--- ___unported__/l10n_es_partner_mercantil/__openerp__.py 2013-01-28 10:29:06 +0000
26+++ l10n_es_partner_mercantil/__openerp__.py 2014-07-11 08:57:19 +0000
27@@ -6,8 +6,8 @@
28 # $Id$
29 #
30 # This program is free software: you can redistribute it and/or modify
31-# it under the terms of the GNU Affero General Public License as published by
32-# the Free Software Foundation, either version 3 of the License, or
33+# it under the terms of the GNU Affero General Public License as published
34+# by the Free Software Foundation, either version 3 of the License, or
35 # (at your option) any later version.
36 #
37 # This program is distributed in the hope that it will be useful,
38@@ -21,31 +21,27 @@
39 ##############################################################################
40
41 {
42- "name" : "Partner Mercantil",
43- "version" : "1.0",
44- "author" : "Spanish Localization Team",
45- "website" : "https://launchpad.net/openerp-spain",
46- "category" : "Localisation/Europe",
47- "description": """Añade los siguientes campos en la ficha de Empresa:
48- * Libro
49- * Registro Mercantil
50- * Hoja
51- * Folio
52- * Seccion
53- * Tomo
54-""",
55- "license" : "AGPL-3",
56- "depends" : [
57+ "name": "Partner Mercantil",
58+ "version": "1.0",
59+ "author": "Spanish Localization Team",
60+ "website": "https://launchpad.net/openerp-spain",
61+ "category": "Localisation/Europe",
62+ "description": """
63+ Añade los siguientes campos en la ficha de Empresa:
64+ * Libro
65+ * Registro Mercantil
66+ * Hoja
67+ * Folio
68+ * Seccion
69+ * Tomo
70+ """,
71+ "license": "AGPL-3",
72+ "depends": [
73 "base",
74- ],
75- "init_xml" : [],
76- "update_xml" : [
77- "partner_es_view.xml",
78- ],
79- "active": False,
80- "installable": False
81+ ],
82+ "data": [
83+ "views/partner_es_view.xml",
84+ ],
85+ "active": True,
86+ "installable": True
87 }
88-
89-
90-
91-
92
93=== modified file 'l10n_es_partner_mercantil/i18n/ca.po'
94--- ___unported__/l10n_es_partner_mercantil/i18n/ca.po 2014-03-04 08:27:58 +0000
95+++ l10n_es_partner_mercantil/i18n/ca.po 2014-07-11 08:57:19 +0000
96@@ -1,86 +1,64 @@
97 # Translation of OpenERP Server.
98 # This file contains the translation of the following modules:
99-# * l10n_ES_partner_mercantil
100+# * l10n_es_partner_mercantil
101 #
102 msgid ""
103 msgstr ""
104-"Project-Id-Version: OpenERP Server 5.0.1\n"
105-"Report-Msgid-Bugs-To: support@openerp.com\n"
106-"POT-Creation-Date: 2009-07-22 08:22+0000\n"
107-"PO-Revision-Date: 2013-10-10 15:00+0000\n"
108+"Project-Id-Version: OpenERP Server 7.0\n"
109+"Report-Msgid-Bugs-To: \n"
110+"POT-Creation-Date: 2014-07-11 08:52+0000\n"
111+"PO-Revision-Date: 2014-07-11 08:52+0000\n"
112 "Last-Translator: <>\n"
113 "Language-Team: \n"
114 "MIME-Version: 1.0\n"
115 "Content-Type: text/plain; charset=UTF-8\n"
116-"Content-Transfer-Encoding: 8bit\n"
117-"X-Launchpad-Export-Date: 2014-03-04 08:27+0000\n"
118-"X-Generator: Launchpad (build 16948)\n"
119-
120-#. module: l10n_ES_partner_mercantil
121-#: constraint:ir.ui.view:0
122-msgid "Invalid XML for View Architecture!"
123-msgstr "XML invàlid per a la definició de la vista!"
124-
125-#. module: l10n_ES_partner_mercantil
126+"Content-Transfer-Encoding: \n"
127+"Plural-Forms: \n"
128+
129+#. module: l10n_es_partner_mercantil
130+#: field:res.partner,es_libro:0
131+msgid "Book"
132+msgstr "Llibre"
133+
134+#. module: l10n_es_partner_mercantil
135+#: view:res.partner:0
136+msgid "Commercial Info"
137+msgstr "Informació Mercantil"
138+
139+#. module: l10n_es_partner_mercantil
140 #: field:res.partner,es_registro_mercantil:0
141 msgid "Commercial Registry"
142 msgstr "Registre Mercantil"
143
144-#. module: l10n_ES_partner_mercantil
145+#. module: l10n_es_partner_mercantil
146+#: view:res.partner:0
147+msgid "Internal Notes"
148+msgstr "Internal Notes"
149+
150+#. module: l10n_es_partner_mercantil
151+#: field:res.partner,es_folio:0
152+msgid "Page"
153+msgstr "Foli"
154+
155+#. module: l10n_es_partner_mercantil
156+#: code:_description:0
157+#: model:ir.model,name:l10n_es_partner_mercantil.model_res_partner
158+#, python-format
159+msgid "Partner"
160+msgstr "Empresa"
161+
162+#. module: l10n_es_partner_mercantil
163 #: field:res.partner,es_seccion:0
164 msgid "Section"
165 msgstr "Secció"
166
167-#. module: l10n_ES_partner_mercantil
168-#: view:res.partner:0
169-msgid "Notes"
170-msgstr "Notes"
171-
172-#. module: l10n_ES_partner_mercantil
173-#: field:res.partner,es_folio:0
174-msgid "Page"
175-msgstr "Foli"
176-
177-#. module: l10n_ES_partner_mercantil
178+#. module: l10n_es_partner_mercantil
179+#: field:res.partner,es_hoja:0
180+msgid "Sheet"
181+msgstr "Full"
182+
183+#. module: l10n_es_partner_mercantil
184 #: field:res.partner,es_tomo:0
185 msgid "Volume"
186 msgstr "Volum"
187
188-#. module: l10n_ES_partner_mercantil
189-#: model:ir.module.module,description:l10n_ES_partner_mercantil.module_meta_information
190-msgid ""
191-"Añade los siguientes campos en la ficha de Empresa:\n"
192-" * Libro\n"
193-" * Registro Mercantil\n"
194-" * Hoja\n"
195-" * Folio\n"
196-" * Seccion\n"
197-" * Tomo\n"
198-msgstr ""
199-"Afegeix els següents camps a la fitxa d'empresa:\n"
200-" * Llibre\n"
201-" * Registre Mercantil\n"
202-" * Full\n"
203-" * Foli\n"
204-" * Secció\n"
205-" * Tom\n"
206-
207-#. module: l10n_ES_partner_mercantil
208-#: field:res.partner,es_libro:0
209-msgid "Book"
210-msgstr "Llibre"
211-
212-#. module: l10n_ES_partner_mercantil
213-#: field:res.partner,es_hoja:0
214-msgid "Sheet"
215-msgstr "Full"
216-
217-#. module: l10n_ES_partner_mercantil
218-#: model:ir.module.module,shortdesc:l10n_ES_partner_mercantil.module_meta_information
219-msgid "Partner Mercantil"
220-msgstr "Partner Mercantil"
221-
222-#. module: l10n_ES_partner_mercantil
223-#: view:res.partner:0
224-msgid "Commercial Info"
225-msgstr "Informació Mercantil"
226
227=== modified file 'l10n_es_partner_mercantil/i18n/es.po'
228--- ___unported__/l10n_es_partner_mercantil/i18n/es.po 2014-03-04 08:27:58 +0000
229+++ l10n_es_partner_mercantil/i18n/es.po 2014-07-11 08:57:19 +0000
230@@ -1,86 +1,64 @@
231 # Translation of OpenERP Server.
232 # This file contains the translation of the following modules:
233-# * l10n_ES_partner_mercantil
234+# * l10n_es_partner_mercantil
235 #
236 msgid ""
237 msgstr ""
238-"Project-Id-Version: OpenERP Server 5.0.1\n"
239-"Report-Msgid-Bugs-To: support@openerp.com\n"
240-"POT-Creation-Date: 2009-07-22 08:22+0000\n"
241-"PO-Revision-Date: 2013-10-10 15:00+0000\n"
242+"Project-Id-Version: OpenERP Server 7.0\n"
243+"Report-Msgid-Bugs-To: \n"
244+"POT-Creation-Date: 2014-07-11 08:51+0000\n"
245+"PO-Revision-Date: 2014-07-11 08:51+0000\n"
246 "Last-Translator: <>\n"
247 "Language-Team: \n"
248 "MIME-Version: 1.0\n"
249 "Content-Type: text/plain; charset=UTF-8\n"
250-"Content-Transfer-Encoding: 8bit\n"
251-"X-Launchpad-Export-Date: 2014-03-04 08:27+0000\n"
252-"X-Generator: Launchpad (build 16948)\n"
253-
254-#. module: l10n_ES_partner_mercantil
255-#: constraint:ir.ui.view:0
256-msgid "Invalid XML for View Architecture!"
257-msgstr "¡XML inválido para la definición de la vista!"
258-
259-#. module: l10n_ES_partner_mercantil
260+"Content-Transfer-Encoding: \n"
261+"Plural-Forms: \n"
262+
263+#. module: l10n_es_partner_mercantil
264+#: field:res.partner,es_libro:0
265+msgid "Book"
266+msgstr "Libro"
267+
268+#. module: l10n_es_partner_mercantil
269+#: view:res.partner:0
270+msgid "Commercial Info"
271+msgstr "Información Mercantil"
272+
273+#. module: l10n_es_partner_mercantil
274 #: field:res.partner,es_registro_mercantil:0
275 msgid "Commercial Registry"
276 msgstr "Registro Mercantil"
277
278-#. module: l10n_ES_partner_mercantil
279+#. module: l10n_es_partner_mercantil
280+#: view:res.partner:0
281+msgid "Internal Notes"
282+msgstr "Notas internas"
283+
284+#. module: l10n_es_partner_mercantil
285+#: field:res.partner,es_folio:0
286+msgid "Page"
287+msgstr "Folio"
288+
289+#. module: l10n_es_partner_mercantil
290+#: code:_description:0
291+#: model:ir.model,name:l10n_es_partner_mercantil.model_res_partner
292+#, python-format
293+msgid "Partner"
294+msgstr "Empresa"
295+
296+#. module: l10n_es_partner_mercantil
297 #: field:res.partner,es_seccion:0
298 msgid "Section"
299 msgstr "Sección"
300
301-#. module: l10n_ES_partner_mercantil
302-#: view:res.partner:0
303-msgid "Notes"
304-msgstr "Notas"
305-
306-#. module: l10n_ES_partner_mercantil
307-#: field:res.partner,es_folio:0
308-msgid "Page"
309-msgstr "Folio"
310-
311-#. module: l10n_ES_partner_mercantil
312+#. module: l10n_es_partner_mercantil
313+#: field:res.partner,es_hoja:0
314+msgid "Sheet"
315+msgstr "Hoja"
316+
317+#. module: l10n_es_partner_mercantil
318 #: field:res.partner,es_tomo:0
319 msgid "Volume"
320 msgstr "Tomo"
321
322-#. module: l10n_ES_partner_mercantil
323-#: model:ir.module.module,description:l10n_ES_partner_mercantil.module_meta_information
324-msgid ""
325-"Añade los siguientes campos en la ficha de Empresa:\n"
326-" * Libro\n"
327-" * Registro Mercantil\n"
328-" * Hoja\n"
329-" * Folio\n"
330-" * Seccion\n"
331-" * Tomo\n"
332-msgstr ""
333-"Añade los siguientes campos en la ficha de Empresa:\n"
334-" * Libro\n"
335-" * Registro Mercantil\n"
336-" * Hoja\n"
337-" * Folio\n"
338-" * Sección\n"
339-" * Tomo\n"
340-
341-#. module: l10n_ES_partner_mercantil
342-#: field:res.partner,es_libro:0
343-msgid "Book"
344-msgstr "Libro"
345-
346-#. module: l10n_ES_partner_mercantil
347-#: field:res.partner,es_hoja:0
348-msgid "Sheet"
349-msgstr "Hoja"
350-
351-#. module: l10n_ES_partner_mercantil
352-#: model:ir.module.module,shortdesc:l10n_ES_partner_mercantil.module_meta_information
353-msgid "Partner Mercantil"
354-msgstr "Partner Mercantil"
355-
356-#. module: l10n_ES_partner_mercantil
357-#: view:res.partner:0
358-msgid "Commercial Info"
359-msgstr "Información Mercantil"
360
361=== modified file 'l10n_es_partner_mercantil/i18n/gl.po'
362--- ___unported__/l10n_es_partner_mercantil/i18n/gl.po 2014-03-04 08:27:58 +0000
363+++ l10n_es_partner_mercantil/i18n/gl.po 2014-07-11 08:57:19 +0000
364@@ -1,87 +1,64 @@
365-# Galician translation for openerp-spain
366-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
367-# This file is distributed under the same license as the openerp-spain package.
368-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
369+# Translation of OpenERP Server.
370+# This file contains the translation of the following modules:
371+# * l10n_es_partner_mercantil
372 #
373 msgid ""
374 msgstr ""
375-"Project-Id-Version: openerp-spain\n"
376-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
377-"POT-Creation-Date: 2009-07-22 08:22+0000\n"
378-"PO-Revision-Date: 2013-11-12 12:01+0000\n"
379-"Last-Translator: Alejandro Santana <alejandrosantana@anubia.es>\n"
380-"Language-Team: Galician <gl@li.org>\n"
381+"Project-Id-Version: OpenERP Server 7.0\n"
382+"Report-Msgid-Bugs-To: \n"
383+"POT-Creation-Date: 2014-07-11 08:52+0000\n"
384+"PO-Revision-Date: 2014-07-11 08:52+0000\n"
385+"Last-Translator: <>\n"
386+"Language-Team: \n"
387 "MIME-Version: 1.0\n"
388 "Content-Type: text/plain; charset=UTF-8\n"
389-"Content-Transfer-Encoding: 8bit\n"
390-"X-Launchpad-Export-Date: 2014-03-04 08:27+0000\n"
391-"X-Generator: Launchpad (build 16948)\n"
392-
393-#. module: l10n_ES_partner_mercantil
394-#: constraint:ir.ui.view:0
395-msgid "Invalid XML for View Architecture!"
396-msgstr "¡XML non válido para a estructura da vista!"
397-
398-#. module: l10n_ES_partner_mercantil
399+"Content-Transfer-Encoding: \n"
400+"Plural-Forms: \n"
401+
402+#. module: l10n_es_partner_mercantil
403+#: field:res.partner,es_libro:0
404+msgid "Book"
405+msgstr "Libro"
406+
407+#. module: l10n_es_partner_mercantil
408+#: view:res.partner:0
409+msgid "Commercial Info"
410+msgstr "Información comercial"
411+
412+#. module: l10n_es_partner_mercantil
413 #: field:res.partner,es_registro_mercantil:0
414 msgid "Commercial Registry"
415 msgstr "Rexistro Mercantil"
416
417-#. module: l10n_ES_partner_mercantil
418+#. module: l10n_es_partner_mercantil
419+#: view:res.partner:0
420+msgid "Internal Notes"
421+msgstr "Internal Notes"
422+
423+#. module: l10n_es_partner_mercantil
424+#: field:res.partner,es_folio:0
425+msgid "Page"
426+msgstr "Páxina"
427+
428+#. module: l10n_es_partner_mercantil
429+#: code:_description:0
430+#: model:ir.model,name:l10n_es_partner_mercantil.model_res_partner
431+#, python-format
432+msgid "Partner"
433+msgstr "Empresa"
434+
435+#. module: l10n_es_partner_mercantil
436 #: field:res.partner,es_seccion:0
437 msgid "Section"
438 msgstr "Sección"
439
440-#. module: l10n_ES_partner_mercantil
441-#: view:res.partner:0
442-msgid "Notes"
443-msgstr "Notas"
444-
445-#. module: l10n_ES_partner_mercantil
446-#: field:res.partner,es_folio:0
447-msgid "Page"
448-msgstr "Páxina"
449-
450-#. module: l10n_ES_partner_mercantil
451+#. module: l10n_es_partner_mercantil
452+#: field:res.partner,es_hoja:0
453+msgid "Sheet"
454+msgstr "Folla"
455+
456+#. module: l10n_es_partner_mercantil
457 #: field:res.partner,es_tomo:0
458 msgid "Volume"
459 msgstr "Volume"
460
461-#. module: l10n_ES_partner_mercantil
462-#: model:ir.module.module,description:l10n_ES_partner_mercantil.module_meta_information
463-msgid ""
464-"Añade los siguientes campos en la ficha de Empresa:\n"
465-" * Libro\n"
466-" * Registro Mercantil\n"
467-" * Hoja\n"
468-" * Folio\n"
469-" * Seccion\n"
470-" * Tomo\n"
471-msgstr ""
472-"Engade os seguintes campos na ficha da empresa:\n"
473-" *Libro\n"
474-" *Rexistro Mercantil\n"
475-" *Folla\n"
476-" *Folio\n"
477-" *Sección\n"
478-" *Tomo\n"
479-
480-#. module: l10n_ES_partner_mercantil
481-#: field:res.partner,es_libro:0
482-msgid "Book"
483-msgstr "Libro"
484-
485-#. module: l10n_ES_partner_mercantil
486-#: field:res.partner,es_hoja:0
487-msgid "Sheet"
488-msgstr "Folla"
489-
490-#. module: l10n_ES_partner_mercantil
491-#: model:ir.module.module,shortdesc:l10n_ES_partner_mercantil.module_meta_information
492-msgid "Partner Mercantil"
493-msgstr "Sociedade mercantil"
494-
495-#. module: l10n_ES_partner_mercantil
496-#: view:res.partner:0
497-msgid "Commercial Info"
498-msgstr "Información comercial"
499
500=== modified file 'l10n_es_partner_mercantil/i18n/l10n_es_partner_mercantil.pot'
501--- ___unported__/l10n_es_partner_mercantil/i18n/l10n_es_partner_mercantil.pot 2010-10-18 10:04:25 +0000
502+++ l10n_es_partner_mercantil/i18n/l10n_es_partner_mercantil.pot 2014-07-11 08:57:19 +0000
503@@ -1,13 +1,13 @@
504 # Translation of OpenERP Server.
505 # This file contains the translation of the following modules:
506-# * l10n_ES_partner_mercantil
507+# * l10n_es_partner_mercantil
508 #
509 msgid ""
510 msgstr ""
511-"Project-Id-Version: OpenERP Server 5.0.1\n"
512-"Report-Msgid-Bugs-To: support@openerp.com\n"
513-"POT-Creation-Date: 2009-07-22 08:22:59+0000\n"
514-"PO-Revision-Date: 2009-07-22 08:22:59+0000\n"
515+"Project-Id-Version: OpenERP Server 7.0\n"
516+"Report-Msgid-Bugs-To: \n"
517+"POT-Creation-Date: 2014-07-10 15:45+0000\n"
518+"PO-Revision-Date: 2014-07-10 15:45+0000\n"
519 "Last-Translator: <>\n"
520 "Language-Team: \n"
521 "MIME-Version: 1.0\n"
522@@ -15,65 +15,50 @@
523 "Content-Transfer-Encoding: \n"
524 "Plural-Forms: \n"
525
526-#. module: l10n_ES_partner_mercantil
527-#: constraint:ir.ui.view:0
528-msgid "Invalid XML for View Architecture!"
529-msgstr ""
530-
531-#. module: l10n_ES_partner_mercantil
532+#. module: l10n_es_partner_mercantil
533+#: field:res.partner,es_libro:0
534+msgid "Book"
535+msgstr ""
536+
537+#. module: l10n_es_partner_mercantil
538+#: view:res.partner:0
539+msgid "Commercial Info"
540+msgstr ""
541+
542+#. module: l10n_es_partner_mercantil
543 #: field:res.partner,es_registro_mercantil:0
544 msgid "Commercial Registry"
545 msgstr ""
546
547-#. module: l10n_ES_partner_mercantil
548+#. module: l10n_es_partner_mercantil
549+#: view:res.partner:0
550+msgid "Internal Notes"
551+msgstr ""
552+
553+#. module: l10n_es_partner_mercantil
554+#: field:res.partner,es_folio:0
555+msgid "Page"
556+msgstr ""
557+
558+#. module: l10n_es_partner_mercantil
559+#: code:_description:0
560+#: model:ir.model,name:l10n_es_partner_mercantil.model_res_partner
561+#, python-format
562+msgid "Partner"
563+msgstr ""
564+
565+#. module: l10n_es_partner_mercantil
566 #: field:res.partner,es_seccion:0
567 msgid "Section"
568 msgstr ""
569
570-#. module: l10n_ES_partner_mercantil
571-#: view:res.partner:0
572-msgid "Notes"
573-msgstr ""
574-
575-#. module: l10n_ES_partner_mercantil
576-#: field:res.partner,es_folio:0
577-msgid "Page"
578-msgstr ""
579-
580-#. module: l10n_ES_partner_mercantil
581+#. module: l10n_es_partner_mercantil
582+#: field:res.partner,es_hoja:0
583+msgid "Sheet"
584+msgstr ""
585+
586+#. module: l10n_es_partner_mercantil
587 #: field:res.partner,es_tomo:0
588 msgid "Volume"
589 msgstr ""
590
591-#. module: l10n_ES_partner_mercantil
592-#: model:ir.module.module,description:l10n_ES_partner_mercantil.module_meta_information
593-msgid "Añade los siguientes campos en la ficha de Empresa:\n"
594-" * Libro\n"
595-" * Registro Mercantil\n"
596-" * Hoja\n"
597-" * Folio\n"
598-" * Seccion\n"
599-" * Tomo\n"
600-""
601-msgstr ""
602-
603-#. module: l10n_ES_partner_mercantil
604-#: field:res.partner,es_libro:0
605-msgid "Book"
606-msgstr ""
607-
608-#. module: l10n_ES_partner_mercantil
609-#: field:res.partner,es_hoja:0
610-msgid "Sheet"
611-msgstr ""
612-
613-#. module: l10n_ES_partner_mercantil
614-#: model:ir.module.module,shortdesc:l10n_ES_partner_mercantil.module_meta_information
615-msgid "Partner Mercantil"
616-msgstr ""
617-
618-#. module: l10n_ES_partner_mercantil
619-#: view:res.partner:0
620-msgid "Commercial Info"
621-msgstr ""
622-
623
624=== added directory 'l10n_es_partner_mercantil/models'
625=== added file 'l10n_es_partner_mercantil/models/__init__.py'
626--- l10n_es_partner_mercantil/models/__init__.py 1970-01-01 00:00:00 +0000
627+++ l10n_es_partner_mercantil/models/__init__.py 2014-07-11 08:57:19 +0000
628@@ -0,0 +1,23 @@
629+# -*- coding: utf-8 -*-
630+##############################################################################
631+#
632+# OpenERP, Open Source Management Solution
633+# Copyright (c) 2009 Spanish Localization Team
634+# $Id$
635+#
636+# This program is free software: you can redistribute it and/or modify
637+# it under the terms of the GNU Affero General Public License as published
638+# by the Free Software Foundation, either version 3 of the License, or
639+# (at your option) any later version.
640+#
641+# This program is distributed in the hope that it will be useful,
642+# but WITHOUT ANY WARRANTY; without even the implied warranty of
643+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
644+# GNU Affero General Public License for more details.
645+#
646+# You should have received a copy of the GNU Affero General Public License
647+# along with this program. If not, see <http://www.gnu.org/licenses/>.
648+#
649+##############################################################################
650+
651+from . import partner_es
652
653=== renamed file '___unported__/l10n_es_partner_mercantil/partner_es.py' => 'l10n_es_partner_mercantil/models/partner_es.py'
654--- ___unported__/l10n_es_partner_mercantil/partner_es.py 2011-08-29 15:11:11 +0000
655+++ l10n_es_partner_mercantil/models/partner_es.py 2014-07-11 08:57:19 +0000
656@@ -6,8 +6,8 @@
657 # $Id$
658 #
659 # This program is free software: you can redistribute it and/or modify
660-# it under the terms of the GNU Affero General Public License as published by
661-# the Free Software Foundation, either version 3 of the License, or
662+# it under the terms of the GNU Affero General Public License as published
663+# by the Free Software Foundation, either version 3 of the License, or
664 # (at your option) any later version.
665 #
666 # This program is distributed in the hope that it will be useful,
667@@ -20,18 +20,18 @@
668 #
669 ##############################################################################
670
671-from osv import osv, fields
672-
673-class res_partner(osv.osv):
674+from openerp.osv import orm, fields
675+
676+
677+class ResPartner(orm.Model):
678 _inherit = 'res.partner'
679+
680 _columns = {
681- 'es_libro': fields.char('Book', size=128), #libro
682- 'es_registro_mercantil': fields.char('Commercial Registry', size=128), # Registro Mercantil
683- 'es_hoja': fields.char('Sheet', size=128), #hoja
684- 'es_folio': fields.char('Page', size=128), #folio
685- 'es_seccion': fields.char('Section', size=128),# seccion
686- 'es_tomo': fields.char('Volume', size=128),# tomo
687+ 'es_libro': fields.char('Book', size=128), # libro
688+ # Registro Mercantil
689+ 'es_registro_mercantil': fields.char('Commercial Registry', size=128),
690+ 'es_hoja': fields.char('Sheet', size=128), # hoja
691+ 'es_folio': fields.char('Page', size=128), # folio
692+ 'es_seccion': fields.char('Section', size=128), # seccion
693+ 'es_tomo': fields.char('Volume', size=128), # tomo
694 }
695-
696-res_partner()
697-
698
699=== added directory 'l10n_es_partner_mercantil/views'
700=== renamed file '___unported__/l10n_es_partner_mercantil/partner_es_view.xml' => 'l10n_es_partner_mercantil/views/partner_es_view.xml'
701--- ___unported__/l10n_es_partner_mercantil/partner_es_view.xml 2010-11-12 12:51:14 +0000
702+++ l10n_es_partner_mercantil/views/partner_es_view.xml 2014-07-11 08:57:19 +0000
703@@ -1,22 +1,28 @@
704 <?xml version="1.0" encoding="utf-8"?>
705 <openerp>
706- <data>
707- <record model="ir.ui.view" id="view_partner_form_mercantil">
708- <field name="name">view.partner.form.mercantil</field>
709- <field name="model">res.partner</field>
710- <field name="inherit_id" ref="base.view_partner_form"/>
711- <field name="arch" type="xml">
712- <page string="Notes" position="after">
713- <page string="Commercial Info">
714- <field name="es_libro"/>
715- <field name="es_registro_mercantil"/>
716- <field name="es_hoja"/>
717- <field name="es_folio"/>
718- <field name="es_seccion"/>
719- <field name="es_tomo"/>
720+ <data>
721+ <record model="ir.ui.view" id="view_partner_form_mercantil">
722+ <field name="name">view.partner.form.mercantil</field>
723+ <field name="model">res.partner</field>
724+ <field name="inherit_id" ref="base.view_partner_form" />
725+ <field name="arch" type="xml">
726+ <page string="Internal Notes" position="after">
727+ <page string="Commercial Info" attrs="{'invisible': [('is_company','=',False)]}">
728+ <group>
729+ <group>
730+ <field name="es_libro" />
731+ <field name="es_registro_mercantil" />
732+ <field name="es_hoja" />
733+ </group>
734+ <group>
735+ <field name="es_folio" />
736+ <field name="es_seccion" />
737+ <field name="es_tomo" />
738+ </group>
739+ </group>
740+ </page>
741 </page>
742- </page>
743- </field>
744- </record>
745- </data>
746+ </field>
747+ </record>
748+ </data>
749 </openerp>