Merge lp:~jpg-es/openerp-spain/6.1 into lp:~openerp-spain-team/openerp-spain/6.1

Proposed by José Pastor on 2014-06-20
Status: Merged
Merged at revision: 399
Proposed branch: lp:~jpg-es/openerp-spain/6.1
Merge into: lp:~openerp-spain-team/openerp-spain/6.1
Diff against target: 122 lines (+1/-12)
8 files modified
l10n_es/l10n_es_wizard.xml (+1/-2)
l10n_es/taxes_data.xml (+0/-2)
l10n_es/taxes_data_assoc.xml (+0/-2)
l10n_es/taxes_data_pymes.xml (+0/-2)
l10n_es_partner/partner_es_view.xml (+0/-1)
l10n_es_partner_seq/wizard/create_accounts_view.xml (+0/-1)
l10n_es_payment_order/wizard/export_remesas_view.xml (+0/-1)
l10n_es_toponyms/wizard/l10n_es_toponyms_wizard.xml (+0/-1)
To merge this branch: bzr merge lp:~jpg-es/openerp-spain/6.1
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review 2014-06-20 Approve on 2014-06-20
Review via email: mp+223887@code.launchpad.net

Description of the change

Eliminación de nodos XML de campos eliminados.

En el modelo de datos de la versión 6.1 desaparecen los siguientes campos:
restart en la tabla ir_actions_todo
company_id en la tabla account_tax_code_template
objetct en tabla ir_values

Durante la migración aparecen warnings del tipo

openerp.modules.loading: module l10n_es_partner: loading partner_es_view.xml
openerp.osv.orm: No such field(s) in model ir.actions.todo: restart.

Revisando todos los ficheros de la versión 6.1 de la localización involucrados, se debe a que estos ficheros todavía declaran valor para esos campos, y eso provoca el warning. Las correcciones a realizar son:

En el módulo l10n_es_toponyms: fichero wizard/l10n_es_toponyms_wizard.xml sobra <field name="restart">onskip</field>
En el módulo l10n_es_partner: fichero partner_es_view.xml sobra <field name="restart">onskip</field>
En el módulo l10n_es: fichero taxes_data.xml quitar sobra dos veces <field name="company_id" model="res.company" search="[]"/>
En el módulo l10n_es: fichero taxes_data_pymes.xml sobra dos veces <field name="company_id" model="res.company" search="[]"/>
En el módulo l10n_es: fichero l10n_es_wizard.xml sobra <field name="restart">onskip</field>
En el módulo l10n_es: fichero taxes_data_assoc.xml sobra dos veces <field name="company_id" model="res.company" search="[]"/>
En el módulo l10n_es_partner_seq: fichero wizard/create_accounts_view.xml sobra <field name="object" eval="1" />
En el módulo l10n_es_payment_order: fichero wizard/export_remesas_view.xml sobra <field name="object" eval="1" />

To post a comment you must log in.
Pedro Manuel Baeza (pedro.baeza) wrote :

José, muchas gracias por el MP.

Por mi parte, veo correctos todos los cambios.

Un saludo.

review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_es/l10n_es_wizard.xml'
2--- l10n_es/l10n_es_wizard.xml 2013-07-18 16:08:37 +0000
3+++ l10n_es/l10n_es_wizard.xml 2014-06-20 10:13:39 +0000
4@@ -4,8 +4,7 @@
5
6 <record id="config_call_account_template" model="ir.actions.todo">
7 <field name="action_id" ref="account.action_wizard_multi_chart"/>
8- <field name="restart">onskip</field>
9 </record>
10
11 </data>
12-</openerp>
13\ No newline at end of file
14+</openerp>
15
16=== modified file 'l10n_es/taxes_data.xml'
17--- l10n_es/taxes_data.xml 2013-07-18 16:08:37 +0000
18+++ l10n_es/taxes_data.xml 2014-06-20 10:13:39 +0000
19@@ -44,7 +44,6 @@
20 <!-- Exentas IVA -->
21 <record id="base_sop_ex" model="account.tax.code.template">
22 <field name="name">Base adquisiciones exentas</field>
23- <field name="company_id" model="res.company" search="[]"/>
24 <field name="parent_id" ref="vat_code_chart_root"/>
25 <field name="code">--</field>
26 <field name="sign">1.0</field>
27@@ -53,7 +52,6 @@
28 <record id="base_rep_ex" model="account.tax.code.template">
29 <field name="name">Base ventas exentas</field>
30 <field name="code">--</field>
31- <field name="company_id" model="res.company" search="[]"/>
32 <field name="parent_id" ref="vat_code_chart_root"/>
33 <field name="sign">1.0</field>
34 </record>
35
36=== modified file 'l10n_es/taxes_data_assoc.xml'
37--- l10n_es/taxes_data_assoc.xml 2013-04-22 09:05:50 +0000
38+++ l10n_es/taxes_data_assoc.xml 2014-06-20 10:13:39 +0000
39@@ -44,7 +44,6 @@
40 <!-- Exentas IVA -->
41 <record id="base_assoc_sop_ex" model="account.tax.code.template">
42 <field name="name">Base adquisiciones exentas</field>
43- <field name="company_id" model="res.company" search="[]"/>
44 <field name="parent_id" ref="vat_code_chart_assoc_root"/>
45 <field name="code">--</field>
46 <field name="sign">1.0</field>
47@@ -53,7 +52,6 @@
48 <record id="base_assoc_rep_ex" model="account.tax.code.template">
49 <field name="name">Base ventas exentas</field>
50 <field name="code">--</field>
51- <field name="company_id" model="res.company" search="[]"/>
52 <field name="parent_id" ref="vat_code_chart_assoc_root"/>
53 <field name="sign">1.0</field>
54 </record>
55
56=== modified file 'l10n_es/taxes_data_pymes.xml'
57--- l10n_es/taxes_data_pymes.xml 2013-07-18 16:08:37 +0000
58+++ l10n_es/taxes_data_pymes.xml 2014-06-20 10:13:39 +0000
59@@ -58,7 +58,6 @@
60 <!-- Exentas IVA -->
61 <record id="base_pymes_sop_ex" model="account.tax.code.template">
62 <field name="name">Base adquisiciones exentas</field>
63- <field name="company_id" model="res.company" search="[]"/>
64 <field name="parent_id" ref="vat_code_chart_pymes_root"/>
65 <field name="code">--</field>
66 <field name="sign">1.0</field>
67@@ -67,7 +66,6 @@
68 <record id="base_pymes_rep_ex" model="account.tax.code.template">
69 <field name="name">Base ventas exentas</field>
70 <field name="code">--</field>
71- <field name="company_id" model="res.company" search="[]"/>
72 <field name="parent_id" ref="vat_code_chart_pymes_root"/>
73 <field name="sign">1.0</field>
74 </record>
75
76=== modified file 'l10n_es_partner/partner_es_view.xml'
77--- l10n_es_partner/partner_es_view.xml 2014-01-03 15:52:47 +0000
78+++ l10n_es_partner/partner_es_view.xml 2014-06-20 10:13:39 +0000
79@@ -142,7 +142,6 @@
80 <field name="action_id" ref="action_partner_import_wizard"/>
81 <field name="type">automatic</field>
82 <field name="sequence">25</field>
83- <field name="restart">onskip</field>
84 </record>
85
86 </data>
87
88=== modified file 'l10n_es_partner_seq/wizard/create_accounts_view.xml'
89--- l10n_es_partner_seq/wizard/create_accounts_view.xml 2013-07-18 16:08:37 +0000
90+++ l10n_es_partner_seq/wizard/create_accounts_view.xml 2014-06-20 10:13:39 +0000
91@@ -34,7 +34,6 @@
92
93 <record id="action_account_create_accounts_from_partner" model="ir.values">
94 <field name="model_id" ref="model_res_partner" />
95- <field name="object" eval="1" />
96 <field name="name">Create accounts</field>
97 <field name="key2">client_action_multi</field>
98 <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_create_accounts'))"/>
99
100=== modified file 'l10n_es_payment_order/wizard/export_remesas_view.xml'
101--- l10n_es_payment_order/wizard/export_remesas_view.xml 2013-07-18 16:08:37 +0000
102+++ l10n_es_payment_order/wizard/export_remesas_view.xml 2014-06-20 10:13:39 +0000
103@@ -29,7 +29,6 @@
104 <field name="target">new</field>
105 </record>
106 <record id="action_wizard_payment_file_spain2" model="ir.values">
107- <field name="object" eval="1" />
108 <field name="name">Create payments file</field>
109 <field name="key2">client_action_multi</field>
110 <field name="value" eval="'ir.actions.act_window,' + str(ref('action_wizard_payment_file_spain'))"/>
111
112=== modified file 'l10n_es_toponyms/wizard/l10n_es_toponyms_wizard.xml'
113--- l10n_es_toponyms/wizard/l10n_es_toponyms_wizard.xml 2013-09-26 08:41:34 +0000
114+++ l10n_es_toponyms/wizard/l10n_es_toponyms_wizard.xml 2014-06-20 10:13:39 +0000
115@@ -61,7 +61,6 @@
116 <field name="action_id" ref="action_config_toponyms_es_form"/>
117 <field name="type">automatic</field>
118 <field name="sequence">20</field>
119- <field name="restart">onskip</field>
120 </record>
121
122 </data>