Merge lp:~openerp-dev/openobject-addons/6.1-opw-579697-ado into lp:openobject-addons/6.1

[Amit Dodiya (OpenERP)]

Hello,

"[FIX] generate opening entries wizard gives error due to null value in amount_currency field"

When amount_currency field of account move line contains null value the wizard "Generate Opening Entry" will gives the following error.
TypeError: unsupported operand type(s) for /: 'NoneType' and 'float'

Regards,
Amit Dodiya

Unmerged revisions

7006. By Amit Dodiya<email address hidden> on 2012-09-27

[FIX] generate opening entries wizard gives error due to null value in amount_currency field

=== modified file 'account/account.py'
--- account/account.py	2012-08-28 07:48:35 +0000
+++ account/account.py	2012-09-27 13:01:31 +0000
@@ -1519,7 +1519,7 @@
         cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
 
         #adjust also the amount in currency if needed
-        cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
+        cr.execute("select currency_id, COALESCE(sum(amount_currency), 0) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
         for row in cr.dictfetchall():
             currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
             if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):