Odoo Addons (MOVED TO GITHUB)

Merge lp:~rr.clearcorp/openobject-addons/6.1-ccorp-account into lp:~clearcorp-drivers/openobject-addons/6.1-ccorp

  1. 6.1-ccorp-account
  2. Merge into 6.1-ccorp
Proposed by Ronald Rubi
Status: Merged
Merged at revision: 6812
Proposed branch: lp:~rr.clearcorp/openobject-addons/6.1-ccorp-account
Merge into: lp:~clearcorp-drivers/openobject-addons/6.1-ccorp
Diff against target: 12 lines (+1/-1)
1 file modified
account/account.py (+1/-1)
To merge this branch: bzr merge lp:~rr.clearcorp/openobject-addons/6.1-ccorp-account
Reviewer Review Type Date Requested Status
ClearCorp drivers Pending
Review via email: mp+145696@code.launchpad.net

Description of the change

Merge patch support openerp. Fix Generate Opening Entries where amount_currency in account_move_line is NULL

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account.py'
2--- account/account.py 2012-10-10 20:56:39 +0000
3+++ account/account.py 2013-01-30 19:15:29 +0000
4@@ -1519,7 +1519,7 @@
5 cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
6
7 #adjust also the amount in currency if needed
8- 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,))
9+ cr.execute("select currency_id, COALESCE(sum(amount_currency),0.0) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
10 for row in cr.dictfetchall():
11 currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
12 if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):

Subscribers

People subscribed via source and target branches