-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-# $Id$
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
+from operator import itemgetter
from osv import fields, osv
-
+from tools.translate import _
class account_move_line(osv.osv):
_inherit = "account.move.line"
- def amount_to_pay(self, cr, uid, ids, name, arg={}, context={}):
+ def amount_to_pay(self, cr, uid, ids, name, arg={}, context=None):
""" Return the amount still to pay regarding all the payemnt orders
(excepting cancelled orders)"""
if not ids:
INNER JOIN payment_order po
ON (pl.order_id = po.id)
WHERE move_line_id = ml.id
- AND po.state != 'cancel') as amount
+ AND po.state != 'cancel') AS amount
FROM account_move_line ml
- WHERE id in (%s)""" % (",".join(map(str, ids))))
- r=dict(cr.fetchall())
+ WHERE id IN %s""", (tuple(ids),))
+ r = dict(cr.fetchall())
return r
- def _to_pay_search(self, cr, uid, obj, name, args):
- if not len(args):
+ def _to_pay_search(self, cr, uid, obj, name, args, context=None):
+ if not args:
return []
line_obj = self.pool.get('account.move.line')
query = line_obj._query_get(cr, uid, context={})
END - coalesce(sum(pl.amount_currency), 0)
FROM payment_line pl
INNER JOIN payment_order po ON (pl.order_id = po.id)
- WHERE move_line_id = l.id AND po.state != 'cancel')''' \
- + x[1] + str(x[2])+' ',args))
+ WHERE move_line_id = l.id
+ AND po.state != 'cancel'
+ ) %(operator)s %%s ''' % {'operator': x[1]}, args))
+ sql_args = tuple(map(itemgetter(2), args))
- cr.execute(('''select id
- from account_move_line l
- where account_id in (select id
- from account_account
- where type=%s and active)
- and reconcile_id is null
- and credit > 0
- and ''' + where + ' and ' + query), ('payable',) )
+ cr.execute(('''SELECT id
+ FROM account_move_line l
+ WHERE account_id IN (select id
+ FROM account_account
+ WHERE type=%s AND active)
+ AND reconcile_id IS null
+ AND credit > 0
+ AND ''' + where + ' and ' + query), ('payable',)+sql_args )
res = cr.fetchall()
- if not len(res):
- return [('id','=','0')]
- return [('id','in',map(lambda x:x[0], res))]
+ if not res:
+ return [('id', '=', '0')]
+ return [('id', 'in', map(lambda x:x[0], res))]
def line2bank(self, cr, uid, ids, payment_type=None, context=None):
"""
- Try to return for each account move line a corresponding bank
+ Try to return for each Ledger Posting line a corresponding bank
account according to the payment type. This work using one of
the bank of the partner defined on the invoice eventually
associated to the line.
context=context)
for line in self.browse(cr, uid, ids, context=context):
line2bank[line.id] = False
- if line.invoice and line.invoice.partner_bank:
- line2bank[line.id] = line.invoice.partner_bank.id
+ if line.invoice and line.invoice.partner_bank_id:
+ line2bank[line.id] = line.invoice.partner_bank_id.id
elif line.partner_id:
if not line.partner_id.bank_ids:
- #raise osv.except_osv(_('Error !'), _('Partner '+ line.partner_id.name+ ' has no bank account defined'))
line2bank[line.id] = False
else:
for bank in line.partner_id.bank_ids:
return line2bank
_columns = {
- 'amount_to_pay' : fields.function(amount_to_pay, method=True,
+ 'amount_to_pay': fields.function(amount_to_pay,
type='float', string='Amount to pay', fnct_search=_to_pay_search),
}
account_move_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
projects / odoo / odoo.git / blobdiff