[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-suppl...

bzr revid: atp@tinyerp.com-20120628032034-d0x1nebzoz0pvvqo

diff --cc addons/account_check_writing/account_voucher_view.xml
index b53bdc3,8805bc4..910923a
--- 1/addons/account_check_writing/account_voucher_view.xml
--- 2/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@@ -8,20 -8,137 +8,134 @@@
              <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">
-                 <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">
+               <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') ]}"/>
-                 </button>
+                     <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 col="4">
 -                      <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"/>
 -                      <field name="journal_id"
++                  <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"/>
 -                    </group>
 -                    <group>
 -                      <label for="amount" string="Total" class="oe_inline"/>
 -                          <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>
 -                    </group>
 -                      <group col="4">
 -                        <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                         <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="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 class="oe_subtotal_footer oe_right">
 -                                              <field name="amount_line_total" class="oe_subtotal_footer_separator"/>
 -                              </group>
+                             <group>
+                                 <group string="Internal Notes">
+                                     <field name="narration" colspan="2" nolabel="1"/>
+                                 </group>
+                                 <group>
+                                     <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                         <separator string="Currency Options" colspan="4"/>
+                                         <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)" colspan="3"/>
+                                         <field name="payment_rate_currency_id" colspan="1" 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" colspan="4" invisible="1"/>
+                                     </group>
+                                     <group col="2">
+                                         <separator string="Payment Options" colspan="2"/>
+                                         <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>
+                             </group>
+                         </page>
+                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
+                             <group col="4">
+                                 <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>
          </record>
  

diff --cc addons/account_voucher/voucher_payment_receipt_view.xml
index 5bda066,03cee6d..0607d01
--- 1/addons/account_voucher/voucher_payment_receipt_view.xml
--- 2/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@@ -150,25 -150,33 +150,36 @@@
                      <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                  </header>
                  <sheet string="Bill Payment">
-                     <group col="6">
-                         <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"/>
-                         <field name="amount" 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)"/>
 -                      <label for="partner_id" class="oe_edit_only" string="Supplier"/>
 -                      <h1>
 -                              <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"/>
 -                      </h1>
 -                    <h2>
 -                      Pay
 -                          <field name="amount" 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)" nolabel="1"/>
 -                      by
 -                      <field name="journal_id"
++                   <label for="partner_id" class="oe_edit_only" string="Supplier"/>
++                   <h1>
++                     <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}"/>
++                   </h1>
++                   <h2>
++                       Pay
++                       <field name="amount" 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)" nolabel="1" class="oe_inline"/>
++                       by
 +                        <field name="journal_id"
-                             domain="[('type','in',['bank', 'cash'])]"
-                             invisible="context.get('line_type', False)"
+                         domain="[('type','in',['bank', 'cash'])]"
+                         invisible="context.get('line_type', False)"
+                         widget="selection" class="oe_inline"
+                         on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
+                         nolabel="1" colspan="4"/>
 -                      </h2>
 -                    
 -                   <group col="4">
 -                        <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
 -                        <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="company_id" widget="selection" groups="base.group_multi_company"/>
 -                        <field name="account_id"
++                   </h2>
++                   <group>
++                       <group>
++                          <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
++                          <field name="company_id" widget="selection" groups="base.group_multi_company"/>
++                       </group> 
++                       <group>
++                          <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="account_id"
                              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="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                         <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="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"/>
++                            invisible="1"/>
++                          <field name="pre_line" invisible="1"/>
++                          <field name="type" invisible="1"/>
++                          <field name="currency_id" invisible="1" colspan="4"/>
++                        </group>
                      </group>
                      <notebook>
                          <page string="Payment Information">