Merge lp:~pexego/openerp-spain/openerp_spain_javier into lp:~openerp-spain-team/openerp-spain/6.1

Proposed by Javier
Status: Merged
Merged at revision: 381
Proposed branch: lp:~pexego/openerp-spain/openerp_spain_javier
Merge into: lp:~openerp-spain-team/openerp-spain/6.1
Diff against target: 24 lines (+2/-1)
2 files modified
l10n_es_partner/__openerp__.py (+1/-0)
l10n_es_partner/partner_es_view.xml (+1/-1)
To merge this branch: bzr merge lp:~pexego/openerp-spain/openerp_spain_javier
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza Approve
Review via email: mp+200116@code.launchpad.net

Description of the change

Se corriege una herencia erronea del módulo l10n_es_partner

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

Buenas, Javier, gracias por detectar y reparar el problema. No obstante, ya que lo reparamos, vamos a hacerlo bien, cambiando la sustitución del campo por una sustitución de atributos, de tal forma que si existen otras propiedades asociadas al campo, no se pierdan en la herencia.

De tal forma que quedaría así:

<field name="acc_number" position="attributes">
  <attribute name="on_change">onchange_banco(acc_number, acc_country_id)"<attribute/>
</field>

El context no hace falta pasarlo explícitamente como argumento, ya que lo pasa automáticamente el ORM. Paso a realizar el MP con ese cambio.

Un saludo.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_es_partner/__openerp__.py'
2--- l10n_es_partner/__openerp__.py 2013-07-18 16:08:37 +0000
3+++ l10n_es_partner/__openerp__.py 2013-12-27 15:14:26 +0000
4@@ -50,6 +50,7 @@
5 "base",
6 "base_iban",
7 "l10n_es_toponyms",
8+ "account",
9 ],
10 "init_xml" : [],
11 "update_xml" : [
12
13=== modified file 'l10n_es_partner/partner_es_view.xml'
14--- l10n_es_partner/partner_es_view.xml 2013-09-26 08:41:34 +0000
15+++ l10n_es_partner/partner_es_view.xml 2013-12-27 15:14:26 +0000
16@@ -5,7 +5,7 @@
17 <record model="ir.ui.view" id="view_partner_form_banco">
18 <field name="name">view.partner.form.banco</field>
19 <field name="model">res.partner</field>
20- <field name="inherit_id" ref="base.view_partner_form"/>
21+ <field name="inherit_id" ref="account.view_partner_property_form"/>
22 <field name="arch" type="xml">
23 <field name="acc_number" position="replace">
24 <field name="acc_number" on_change="onchange_banco(acc_number, acc_country_id, context)"/>