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

Proposed by Mohammed Shekha(Open ERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6960
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-577823-msh
Merge into: lp:openobject-addons/6.1
Diff against target: 42 lines (+20/-1)
2 files modified
account/account_view.xml (+1/-1)
account_bank_statement_extensions/account_bank_statement_view.xml (+19/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-577823-msh
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+120728@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

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)

[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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_view.xml'
2--- account/account_view.xml 2012-05-28 06:02:51 +0000
3+++ account/account_view.xml 2012-08-22 09:41:40 +0000
4@@ -2634,7 +2634,7 @@
5 </group>
6
7 <notebook colspan="4">
8- <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
9+ <page string="Cash Transactions" name="statement_lines" attrs="{'invisible': [('state','=','draft')]}">
10 <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}">
11 <tree editable="bottom" string="Statement lines">
12 <field name="sequence" invisible="1"/>
13
14=== modified file 'account_bank_statement_extensions/account_bank_statement_view.xml'
15--- account_bank_statement_extensions/account_bank_statement_view.xml 2012-05-28 10:15:13 +0000
16+++ account_bank_statement_extensions/account_bank_statement_view.xml 2012-08-22 09:41:40 +0000
17@@ -60,6 +60,25 @@
18 </field>
19 </record>
20
21+ <!-- add state to bank statement line -->
22+
23+ <record id="view_bank_statement_form2_add_fields" model="ir.ui.view">
24+ <field name="name">view.bank.statement.form2.add.fields</field>
25+ <field name="model">account.bank.statement</field>
26+ <field name="inherit_id" ref="account.view_bank_statement_form2"/>
27+ <field name="type">form</field>
28+ <field name="arch" type="xml">
29+ <data>
30+ <xpath expr="/form/notebook/page[@name='statement_lines']/field[@name='line_ids']/tree/field[@name='date']" position="after">
31+ <field name="state" invisible="1"/>
32+ </xpath>
33+ <xpath expr="/form/notebook/page[@name='statement_lines']/field[@name='line_ids']/form/field[@name='date']" position="after">
34+ <field name="state" invisible="1"/>
35+ </xpath>
36+ </data>
37+ </field>
38+ </record>
39+
40 <!-- Bank Statement Line View -->
41
42 <record id="view_bank_statement_line_list" model="ir.ui.view">