Merge lp:~openerp-dev/openobject-addons/6.1-opw-577823-msh into lp:openobject-addons/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of state field in account_bank_statement_extensions, here account_bank_statement_extensions adds state filed to model and there are some state based conditions in fields, so view must have state field so that modifiers evaluated, hence add sate field to statement_lines tree and form view.

Demo :- Install account_bank_statement_extensions, now create one cash registers -> Open Cashbox -> in Cash Transaction tab create statement line it will throw the state field undefined error.

Hence added the state field in the view account.view_bank_statement_form2.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6960. By Mohammed Shekha(Open ERP) on 2012-08-22

[FIX]Fixed the issue of state field in account_bank_statement_extensions, here account_bank_statement_extensions adds state filed to model and there are some state based conditions in fields, so view must have state field so that modifiers evaluated, hence add sate field to statement_lines tree and form view.

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2012-05-28 06:02:51 +0000
+++ account/account_view.xml	2012-08-22 09:41:40 +0000
@@ -2634,7 +2634,7 @@
                     </group>
 
                     <notebook colspan="4">
-                        <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
+                        <page string="Cash Transactions" name="statement_lines" attrs="{'invisible': [('state','=','draft')]}">
                             <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" invisible="1"/>
 
=== modified file 'account_bank_statement_extensions/account_bank_statement_view.xml'
--- account_bank_statement_extensions/account_bank_statement_view.xml	2012-05-28 10:15:13 +0000
+++ account_bank_statement_extensions/account_bank_statement_view.xml	2012-08-22 09:41:40 +0000
@@ -60,6 +60,25 @@
       </field>
     </record>
 
+    <!-- add state to bank statement line -->
+
+    <record id="view_bank_statement_form2_add_fields" model="ir.ui.view">
+      <field name="name">view.bank.statement.form2.add.fields</field>
+      <field name="model">account.bank.statement</field>
+      <field name="inherit_id" ref="account.view_bank_statement_form2"/>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <data>
+          <xpath expr="/form/notebook/page[@name='statement_lines']/field[@name='line_ids']/tree/field[@name='date']" position="after">
+            <field name="state" invisible="1"/>
+          </xpath>
+          <xpath expr="/form/notebook/page[@name='statement_lines']/field[@name='line_ids']/form/field[@name='date']" position="after">
+            <field name="state" invisible="1"/>
+          </xpath>
+        </data>
+      </field>
+    </record>
+
     <!-- Bank Statement Line View -->
 
     <record id="view_bank_statement_line_list" model="ir.ui.view">