From 3bd0b83f601039e27f18701d39b208783109ee7a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:20:29 +0200
Subject: [PATCH] [REV] account_check_writing: why should define a NEW form
 view of voucher AGAIN??\!

bzr revid: qdp-launchpad@openerp.com-20120718102029-nbvg98ojon60e12f
---
 .../account_voucher_view.xml                  | 138 ++----------------
 1 file changed, 13 insertions(+), 125 deletions(-)

diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index 9fafdcd30c3..07d73188db8 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -8,132 +8,20 @@
             <field name="name">account.voucher.payment.check.form</field>
             <field name="model">account.voucher</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
             <field name="arch" type="xml">
-                <form version="7.0">
-	                <header>
-	                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
-	                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
-	                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
-	                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-	                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
-	                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-	                </header>
-	                <sheet string="Bill Payment">
-	                    <group> 
-	                        <group>
-	                            <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
-	                            <label for="amount" string="Total"/>
-	                            <div>
-	                                <field name="amount" class="oe_inline" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> -
-	                                <field name="amount_in_word" class="oe_inline" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="1"/> 
-	                            </div>
-	                            <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-	                        </group>
-	                        <group>
-	                            <field name="journal_id"
-	                             domain="[('type','in',['bank', 'cash'])]"
-	                             invisible="context.get('line_type', False)"
-	                             widget="selection"
-	                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
-	                             string="Payment Method"/>
-	                            <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
-	                            <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
-	                            <field name="allow_check" invisible="1"/>
-	                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-	                            <field name="account_id"
-	                             widget="selection"
-	                             invisible="True"/>
-	                            <field name="pre_line" invisible="1"/>
-	                            <field name="type" invisible="True"/>
-	                            <field name="currency_id" invisible="1" colspan="4"/>
-	                        </group>
-	                    </group>
-	                    <notebook>
-	                        <page string="Payment Information">
-	                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
-	                                <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
-	                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
-	                                        on_change="onchange_move_line_id(move_line_id)"
-	                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-	                                        required="1"
-	                                        />
-	                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
-	                                    <field name="date_original" readonly="1"/>
-	                                    <field name="date_due" readonly="1"/>
-	                                    <field name="amount_original" readonly="1"/>
-	                                    <field name="amount_unreconciled" readonly="1"/>
-	                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
-	                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
-	                                </tree>
-	                            </field>
-	                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
-	                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
-	                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
-	                                        on_change="onchange_move_line_id(move_line_id)"
-	                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-	                                        required="1"
-	                                        />
-	                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
-	                                    <field name="date_original" readonly="1"/>
-	                                    <field name="date_due" readonly="1"/>
-	                                    <field name="amount_original" readonly="1"/>
-	                                    <field name="amount_unreconciled" readonly="1"/>
-	                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
-	                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
-	                                </tree>
-	                            </field>
-	                            <group col="3">
-	                                <group>
-	                                    <field name="narration"  placeholder="Add an internal note." nolabel="1"/>
-	                                </group>
-                                    <group  string="Currency Options" col="5" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
-                                        <field name="is_multi_currency" invisible="1"/>
-                                        <field name="payment_rate" required="1" 
-                                            on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)"/>
-                                        <field name="payment_rate_currency_id" nolabel="1" 
-                                            on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
-                                        <field name="paid_amount_in_company_currency" invisible="1"/>
-                                    </group>
-                                    <group string="Payment Options">
-                                        <field name="writeoff_amount"/>
-                                        <field name="payment_option" required="1"/>
-                                        <field name="writeoff_acc_id"
-                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-                                               domain="[('type','=','other')]"/>
-                                        <field name="comment"
-                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-                                        <field name="analytic_id"
-                                               groups="analytic.group_analytic_accounting"/>
-                                    </group>
-	                            </group>
-	                        </page>
-	                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-	                            <group>
-	                                <field name="period_id"/>
-	                                <field name="audit"/>
-	                                <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
-	                            </group>
-	                            <field name="move_ids" readonly="1">
-	                                <tree string="Journal Items">
-	                                    <field name="move_id"/>
-	                                    <field name="ref"/>
-	                                    <field name="date"/>
-	                                    <field name="statement_id"/>
-	                                    <field name="partner_id"/>
-	                                    <field name="account_id"/>
-	                                    <field name="name"/>
-	                                    <field name="debit"/>
-	                                    <field name="credit"/>
-	                                    <field name="state"/>
-	                                    <field name="reconcile_id"/>
-	                                    <field name="amount_currency"/>
-	                                    <field name="currency_id"/>
-	                                </tree>
-	                            </field>
-	                        </page>
-	                    </notebook>
-	                </sheet>
-                </form>
+                <field name="journal_id" position="after">
+                    <newline/>
+                    <field name="allow_check" invisible="1"/>
+                    <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
+                    <newline/>
+                </field>
+                <field name="number" position="replace">
+                    <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
+                </field>
+                <button name="proforma_voucher" position="after">
+                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
+                </button>
             </field>
         </record>