From 0b8f9e27fecb77225b77d1d8699089fbd3ae0ca3 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 26 Oct 2010 18:07:13 +0200
Subject: [PATCH] [FIX] account_voucher: added the column voucher_id on cash
 statement + removed amount_reconciled column (useless)

bzr revid: qdp-launchpad@tinyerp.com-20101026160713-9fxnuqz2gjmnsjg4
---
 .../account_voucher/account_voucher_view.xml  | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 79509542015..6a02e3371ab 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -200,7 +200,6 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
-                    <field name="amount_reconciled"/>
                 </xpath>
             </field>
         </record>
@@ -213,7 +212,29 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='sequence']" position="before">
                     <field name="voucher_id" context="{'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
-                    <field name="amount_reconciled"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_cash_statement_tree_voucher" model="ir.ui.view">
+            <field name="name">account.cash.statement.voucher.tree.inherit</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form2"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@name='line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                    <field name="voucher_id" context="{'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_cash_statement_form_voucher" model="ir.ui.view">
+            <field name="name">account.cash.statement.voucher.form.inherit</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form2"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@name='line_ids']/field[@name='line_ids']/form/field[@name='amount']" position="after">
+                    <field name="voucher_id" context="{'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
         </record>