[FIX] small issue in xmo@openerp.com-20120116095337-ko0y6xha6oqx4vw1

[odoo/odoo.git] / addons / account_payment / account_move_line.py

diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 2745518..24f9486 100644 (file)
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -18,6 +18,7 @@
 #    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 _
@@ -25,7 +26,7 @@ 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:
@@ -40,14 +41,14 @@ class account_move_line(osv.osv):
                             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""", (tuple(ids),))
-        r=dict(cr.fetchall())
+        r = dict(cr.fetchall())
         return r
 
-    def _to_pay_search(self, cr, uid, obj, name, args, context):
-        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={})
@@ -63,19 +64,19 @@ class account_move_line(osv.osv):
         ) %(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',)+sql_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',)+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):
         """
@@ -93,11 +94,10 @@ class account_move_line(osv.osv):
                 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:
@@ -111,11 +111,10 @@ class account_move_line(osv.osv):
         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