From ff63ef3576f693cc68047e3920b32c6e9cbe5655 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Wed, 13 Mar 2013 14:43:54 +0100 Subject: [PATCH] [FIX] Change amounttobepaid with related field towards residual in invoice bzr revid: jco@openerp.com-20130313134354-zno7h8o4yhpl0t8z --- addons/account_payment/account_invoice.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py index 7c8560fc9e8..916aa07afa0 100644 --- a/addons/account_payment/account_invoice.py +++ b/addons/account_payment/account_invoice.py @@ -43,26 +43,11 @@ class Invoice(osv.osv): raise osv.except_osv(_('Error!'), _("You cannot cancel an invoice which has already been imported in a payment order. Remove it from the following payment order : %s."%(payment_order_name))) return super(Invoice, self).action_cancel(cr, uid, ids, context=context) - def _amount_to_pay(self, cursor, user, ids, name, args, context=None): - '''Return the amount still to pay regarding all the payment orders''' - if not ids: - return {} - res = {} - for invoice in self.browse(cursor, user, ids, context=context): - res[invoice.id] = 0.0 - if invoice.move_id: - for line in invoice.move_id.line_id: - if not line.date_maturity or \ - datetime.strptime(line.date_maturity, '%Y-%m-%d') \ - < datetime.today(): - res[invoice.id] += line.amount_to_pay - return res _columns = { - 'amount_to_pay': fields.function(_amount_to_pay, + 'amount_to_pay': fields.related('residual', type='float', string='Amount to be paid', - help='The amount which should be paid at the current date\n' \ - 'minus the amount which is already in payment order'), + help='The amount which should be paid at the current date. '), } Invoice()