Merge lp:~unifield-team/unifield-server/us-969 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 3874
Proposed branch: lp:~unifield-team/unifield-server/us-969
Merge into: lp:unifield-server
Diff against target: 17 lines (+1/-2)
1 file modified
bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py (+1/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-969
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+300704@code.launchpad.net
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 'bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py'
2--- bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py 2016-04-26 09:32:48 +0000
3+++ bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py 2016-07-21 08:16:54 +0000
4@@ -714,12 +714,11 @@
5 # Create entries only after all computation have been done
6 for account_id, account_tree in account_sums.iteritems():
7 for currency_id, sums in account_tree.iteritems():
8- new_currency_id = currency_id
9 # If the method is 'other_bs' or 'liquidity_year', get the
10 # account move currency in the currency table
11 if form.revaluation_method in ['liquidity_year', 'other_bs']:
12 currency = currency_obj.browse(cr, uid, currency_id, context=context)
13- new_currency_id = currency_codes_from_table[currency.name]
14+ currency_id = currency_codes_from_table[currency.name]
15 adj_balance = sums.get('unrealized_gain_loss', 0.0)
16 if not adj_balance:
17 continue

Subscribers

People subscribed via source and target branches

to all changes: