← Back to team overview

avanzosc team mailing list archive

[Merge] lp:~avanzosc/openerp-spain/7.0 into lp:openerp-spain/7.0

 

Daniel Campos (Avanzosc) has proposed merging lp:~avanzosc/openerp-spain/7.0 into lp:openerp-spain/7.0.

Requested reviews:
  OpenERP Spain Team (openerp-spain-team)

For more details, see:
https://code.launchpad.net/~avanzosc/openerp-spain/7.0/+merge/159814

Modificaciones en módulos de:
l10n_es_payment_order
l10n_es_bank_statement
-- 
https://code.launchpad.net/~avanzosc/openerp-spain/7.0/+merge/159814
Your team Avanzosc Developers is subscribed to branch lp:~avanzosc/openerp-spain/7.0.
=== modified file 'l10n_es_bank_statement/__init__.py' (properties changed: -x to +x)
=== modified file 'l10n_es_bank_statement/__openerp__.py' (properties changed: -x to +x)
--- l10n_es_bank_statement/__openerp__.py	2013-01-28 10:29:06 +0000
+++ l10n_es_bank_statement/__openerp__.py	2013-04-19 12:40:43 +0000
@@ -65,7 +65,7 @@
         "security/ir.model.access.csv",
         "security/concepto_security.xml"
         ],
-    "installable" : False,
+    "installable" : True,
     "active" : False,
 }
 

=== modified file 'l10n_es_bank_statement/account_bank_statement.py' (properties changed: -x to +x)
=== modified file 'l10n_es_bank_statement/concepto.py' (properties changed: -x to +x)
=== modified file 'l10n_es_bank_statement/data/extractos_conceptos.xml' (properties changed: -x to +x)
=== modified file 'l10n_es_bank_statement/extractos_view.xml' (properties changed: -x to +x)
--- l10n_es_bank_statement/extractos_view.xml	2013-01-11 14:06:10 +0000
+++ l10n_es_bank_statement/extractos_view.xml	2013-04-19 12:40:43 +0000
@@ -49,7 +49,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-				<xpath expr="/form/notebook/page[@string='Transaction']/field/tree/field[@name='partner_id']" position="replace">
+				<xpath expr="/form/sheet/notebook/page[@string='Transactions']/field/tree/field[@name='partner_id']" position="replace">
                     <field name="partner_id" on_change="onchange_partner_id(line_id, partner_id, type, amount, voucher_id, date)"/>
                 </xpath>
             </field>
@@ -61,7 +61,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field/form/field[@name='partner_id']" position="replace">
+				<xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/group/field[@name='partner_id']" position="replace">
                     <field name="partner_id" on_change="onchange_partner_id(line_id, partner_id, type, amount, voucher_id, date)"/>
                 </xpath>
             </field>
@@ -73,7 +73,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field/tree/field[@name='amount']" position="replace">
+				<xpath expr="/form/sheet/notebook/page[@string='Transactions']/field/tree/field[@name='amount']" position="replace">
                     <field name="amount" on_change="onchange_partner_id(line_id, partner_id, type, amount, voucher_id, date)"/>
                 </xpath>
             </field>
@@ -85,7 +85,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field/form/field[@name='amount']" position="replace">
+				<xpath expr="/form/sheet/notebook/page[@string='Transactions']/field/form/group/field[@name='amount']" position="replace">
                     <field name="amount" on_change="onchange_partner_id(line_id, partner_id, type, amount, voucher_id, date)"/>
                 </xpath>
             </field>

=== modified file 'l10n_es_bank_statement/i18n/ca.po' (properties changed: -x to +x)
=== modified file 'l10n_es_bank_statement/i18n/es.po' (properties changed: -x to +x)
=== modified file 'l10n_es_bank_statement/i18n/l10n_es_bank_statement.pot' (properties changed: -x to +x)
=== modified file 'l10n_es_bank_statement/import_c43_file.py' (properties changed: -x to +x)
--- l10n_es_bank_statement/import_c43_file.py	2011-08-31 17:21:09 +0000
+++ l10n_es_bank_statement/import_c43_file.py	2013-04-19 12:40:43 +0000
@@ -28,7 +28,7 @@
 C43 file importation wizard for bank statements.
 """
 from osv import fields,osv
-import wizard
+#import wizard
 import pooler
 import base64
 import time

=== modified file 'l10n_es_bank_statement/import_c43_file_view.xml' (properties changed: -x to +x)
=== modified file 'l10n_es_bank_statement/import_conceptos.py' (properties changed: -x to +x)
=== modified file 'l10n_es_bank_statement/security/concepto_security.xml' (properties changed: -x to +x)
=== modified file 'l10n_es_bank_statement/security/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'l10n_es_payment_order/__openerp__.py'
--- l10n_es_payment_order/__openerp__.py	2013-01-28 10:29:06 +0000
+++ l10n_es_payment_order/__openerp__.py	2013-04-19 12:40:43 +0000
@@ -60,6 +60,6 @@
                 "wizard/export_remesas_view.xml",
         "security/ir.model.access.csv"
                 ],
-    "installable" : False,
+    "installable" : True,
     "active" : False,
 }


Follow ups