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 @@
-
+
@@ -154,7 +154,6 @@
-
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 @@
-