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

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of bank statement lines which was throwing an error of domain as there is state based domain but state field is not shown in tree or form view.

So just added the state field in the view so that state base domain can be evaluated by the client.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Reproducible on 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

6844. By Mohammed Shekha(Open ERP) on 2012-06-15

[FIX]Fixed the issue of bank statement lines which was throwing an error of domain as there is state based domain but state field is not shown in tree or form view.

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2012-02-14 11:07:04 +0000
+++ account/account_view.xml	2012-06-15 05:27:19 +0000
@@ -2645,6 +2645,7 @@
                                     <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
+                                    <field name="state"/>
                                 </tree>
                                 <form string="Statement lines">
                                     <field name="date"/>
@@ -2656,6 +2657,7 @@
                                     <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                     <field name="sequence"/>
+                                    <field name="state"/>
                                     <separator colspan="4" string="Notes"/>
                                     <field colspan="4" name="note" nolabel="1"/>
                                 </form>