From 20a04f01de32be4bb203275b2504c5cf11c71a34 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 11:11:14 +0530
Subject: [PATCH] [IMP] improve view for supplier payment and write checks.

bzr revid: nco@tinyerp.com-20120626054114-nh23jv8dyu98areu
---
 addons/account_check_writing/account_voucher_view.xml   | 7 +++----
 addons/account_voucher/account_voucher.py               | 8 ++------
 addons/account_voucher/voucher_payment_receipt_view.xml | 4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index 7573218229f..d52a595796e 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -96,9 +96,9 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer">
-	                        		<field name="amount_total" class="oe_subtotal_footer_separator"/>
-	                        	</group>
+                            <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"/>
@@ -154,7 +154,6 @@
                     </sheet>
                 </form>
             </field>
-       
         </record>
 
         <record id="action_write_check" model="ir.actions.act_window">
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f7f18f89d3e..21b0a785da6 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -247,16 +247,12 @@ class account_voucher(osv.osv):
                     rate = voucher_rate * company_currency_rate
             res[voucher.id] =  voucher.amount / rate
         return res
-    def _amount_all(self, cr, uid, ids, name, args, context=None):
-        print ids, "\n name ",name, "\n args ::> ", args, "\n context ::> ",context
+    def _amount_total(self, cr, uid, ids, name, args, context=None):
         res = {}
         amount = 0.0
         for voucher in self.browse(cr, uid, ids, context=context):
-            print "voucher :> ",voucher 
             for line in voucher.line_dr_ids:
-                print "line :> ",line
                 amount += line.amount
-                print "amount ::>>  ",amount
             res[voucher.id] = amount
         return res
     _name = 'account.voucher'
@@ -323,7 +319,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
-        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Invoice Total'),
+        'amount_line_total': fields.function(_amount_total, digits_compute=dp.get_precision('Account'), string='Invoice Total'),
     }
     _defaults = {
         'period_id': _get_period,
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ac3bbe93fbb..49e989aac00 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -206,8 +206,8 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer">
-	                        	<field name="amount_total" class="oe_subtotal_footer_separator"/>
+                            <group class="oe_subtotal_footer oe_right">
+	                        	<field name="amount_line_total" class="oe_subtotal_footer_separator"/>
 	                        </group>
                             <group>
                                 <group string="Internal Notes">