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
=== modified file 'l10n_es/l10n_es_wizard.xml'
--- l10n_es/l10n_es_wizard.xml 2013-07-18 16:08:37 +0000
+++ l10n_es/l10n_es_wizard.xml 2014-06-20 10:13:39 +0000
@@ -4,8 +4,7 @@
44
5 <record id="config_call_account_template" model="ir.actions.todo">5 <record id="config_call_account_template" model="ir.actions.todo">
6 <field name="action_id" ref="account.action_wizard_multi_chart"/>6 <field name="action_id" ref="account.action_wizard_multi_chart"/>
7 <field name="restart">onskip</field>
8 </record>7 </record>
98
10 </data>9 </data>
11</openerp>
12\ No newline at end of file10\ No newline at end of file
11</openerp>
1312
=== modified file 'l10n_es/taxes_data.xml'
--- l10n_es/taxes_data.xml 2013-07-18 16:08:37 +0000
+++ l10n_es/taxes_data.xml 2014-06-20 10:13:39 +0000
@@ -44,7 +44,6 @@
44 <!-- Exentas IVA -->44 <!-- Exentas IVA -->
45 <record id="base_sop_ex" model="account.tax.code.template">45 <record id="base_sop_ex" model="account.tax.code.template">
46 <field name="name">Base adquisiciones exentas</field>46 <field name="name">Base adquisiciones exentas</field>
47 <field name="company_id" model="res.company" search="[]"/>
48 <field name="parent_id" ref="vat_code_chart_root"/>47 <field name="parent_id" ref="vat_code_chart_root"/>
49 <field name="code">--</field>48 <field name="code">--</field>
50 <field name="sign">1.0</field>49 <field name="sign">1.0</field>
@@ -53,7 +52,6 @@
53 <record id="base_rep_ex" model="account.tax.code.template">52 <record id="base_rep_ex" model="account.tax.code.template">
54 <field name="name">Base ventas exentas</field>53 <field name="name">Base ventas exentas</field>
55 <field name="code">--</field>54 <field name="code">--</field>
56 <field name="company_id" model="res.company" search="[]"/>
57 <field name="parent_id" ref="vat_code_chart_root"/>55 <field name="parent_id" ref="vat_code_chart_root"/>
58 <field name="sign">1.0</field>56 <field name="sign">1.0</field>
59 </record> 57 </record>
6058
=== modified file 'l10n_es/taxes_data_assoc.xml'
--- l10n_es/taxes_data_assoc.xml 2013-04-22 09:05:50 +0000
+++ l10n_es/taxes_data_assoc.xml 2014-06-20 10:13:39 +0000
@@ -44,7 +44,6 @@
44 <!-- Exentas IVA -->44 <!-- Exentas IVA -->
45 <record id="base_assoc_sop_ex" model="account.tax.code.template">45 <record id="base_assoc_sop_ex" model="account.tax.code.template">
46 <field name="name">Base adquisiciones exentas</field>46 <field name="name">Base adquisiciones exentas</field>
47 <field name="company_id" model="res.company" search="[]"/>
48 <field name="parent_id" ref="vat_code_chart_assoc_root"/>47 <field name="parent_id" ref="vat_code_chart_assoc_root"/>
49 <field name="code">--</field>48 <field name="code">--</field>
50 <field name="sign">1.0</field>49 <field name="sign">1.0</field>
@@ -53,7 +52,6 @@
53 <record id="base_assoc_rep_ex" model="account.tax.code.template">52 <record id="base_assoc_rep_ex" model="account.tax.code.template">
54 <field name="name">Base ventas exentas</field>53 <field name="name">Base ventas exentas</field>
55 <field name="code">--</field>54 <field name="code">--</field>
56 <field name="company_id" model="res.company" search="[]"/>
57 <field name="parent_id" ref="vat_code_chart_assoc_root"/>55 <field name="parent_id" ref="vat_code_chart_assoc_root"/>
58 <field name="sign">1.0</field>56 <field name="sign">1.0</field>
59 </record> 57 </record>
6058
=== modified file 'l10n_es/taxes_data_pymes.xml'
--- l10n_es/taxes_data_pymes.xml 2013-07-18 16:08:37 +0000
+++ l10n_es/taxes_data_pymes.xml 2014-06-20 10:13:39 +0000
@@ -58,7 +58,6 @@
58 <!-- Exentas IVA -->58 <!-- Exentas IVA -->
59 <record id="base_pymes_sop_ex" model="account.tax.code.template">59 <record id="base_pymes_sop_ex" model="account.tax.code.template">
60 <field name="name">Base adquisiciones exentas</field>60 <field name="name">Base adquisiciones exentas</field>
61 <field name="company_id" model="res.company" search="[]"/>
62 <field name="parent_id" ref="vat_code_chart_pymes_root"/>61 <field name="parent_id" ref="vat_code_chart_pymes_root"/>
63 <field name="code">--</field>62 <field name="code">--</field>
64 <field name="sign">1.0</field>63 <field name="sign">1.0</field>
@@ -67,7 +66,6 @@
67 <record id="base_pymes_rep_ex" model="account.tax.code.template">66 <record id="base_pymes_rep_ex" model="account.tax.code.template">
68 <field name="name">Base ventas exentas</field>67 <field name="name">Base ventas exentas</field>
69 <field name="code">--</field>68 <field name="code">--</field>
70 <field name="company_id" model="res.company" search="[]"/>
71 <field name="parent_id" ref="vat_code_chart_pymes_root"/>69 <field name="parent_id" ref="vat_code_chart_pymes_root"/>
72 <field name="sign">1.0</field>70 <field name="sign">1.0</field>
73 </record> 71 </record>
7472
=== modified file 'l10n_es_partner/partner_es_view.xml'
--- l10n_es_partner/partner_es_view.xml 2014-01-03 15:52:47 +0000
+++ l10n_es_partner/partner_es_view.xml 2014-06-20 10:13:39 +0000
@@ -142,7 +142,6 @@
142 <field name="action_id" ref="action_partner_import_wizard"/>142 <field name="action_id" ref="action_partner_import_wizard"/>
143 <field name="type">automatic</field>143 <field name="type">automatic</field>
144 <field name="sequence">25</field>144 <field name="sequence">25</field>
145 <field name="restart">onskip</field>
146 </record>145 </record>
147146
148 </data>147 </data>
149148
=== modified file 'l10n_es_partner_seq/wizard/create_accounts_view.xml'
--- l10n_es_partner_seq/wizard/create_accounts_view.xml 2013-07-18 16:08:37 +0000
+++ l10n_es_partner_seq/wizard/create_accounts_view.xml 2014-06-20 10:13:39 +0000
@@ -34,7 +34,6 @@
3434
35 <record id="action_account_create_accounts_from_partner" model="ir.values">35 <record id="action_account_create_accounts_from_partner" model="ir.values">
36 <field name="model_id" ref="model_res_partner" />36 <field name="model_id" ref="model_res_partner" />
37 <field name="object" eval="1" />
38 <field name="name">Create accounts</field>37 <field name="name">Create accounts</field>
39 <field name="key2">client_action_multi</field>38 <field name="key2">client_action_multi</field>
40 <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_create_accounts'))"/>39 <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_create_accounts'))"/>
4140
=== modified file 'l10n_es_payment_order/wizard/export_remesas_view.xml'
--- l10n_es_payment_order/wizard/export_remesas_view.xml 2013-07-18 16:08:37 +0000
+++ l10n_es_payment_order/wizard/export_remesas_view.xml 2014-06-20 10:13:39 +0000
@@ -29,7 +29,6 @@
29 <field name="target">new</field>29 <field name="target">new</field>
30 </record>30 </record>
31 <record id="action_wizard_payment_file_spain2" model="ir.values">31 <record id="action_wizard_payment_file_spain2" model="ir.values">
32 <field name="object" eval="1" />
33 <field name="name">Create payments file</field>32 <field name="name">Create payments file</field>
34 <field name="key2">client_action_multi</field>33 <field name="key2">client_action_multi</field>
35 <field name="value" eval="'ir.actions.act_window,' + str(ref('action_wizard_payment_file_spain'))"/>34 <field name="value" eval="'ir.actions.act_window,' + str(ref('action_wizard_payment_file_spain'))"/>
3635
=== modified file 'l10n_es_toponyms/wizard/l10n_es_toponyms_wizard.xml'
--- l10n_es_toponyms/wizard/l10n_es_toponyms_wizard.xml 2013-09-26 08:41:34 +0000
+++ l10n_es_toponyms/wizard/l10n_es_toponyms_wizard.xml 2014-06-20 10:13:39 +0000
@@ -61,7 +61,6 @@
61 <field name="action_id" ref="action_config_toponyms_es_form"/>61 <field name="action_id" ref="action_config_toponyms_es_form"/>
62 <field name="type">automatic</field>62 <field name="type">automatic</field>
63 <field name="sequence">20</field>63 <field name="sequence">20</field>
64 <field name="restart">onskip</field>
65 </record>64 </record>
6665
67</data>66</data>