Merge lp:~julie-w/unifield-server/US-6424 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 5505
Proposed branch: lp:~julie-w/unifield-server/US-6424
Merge into: lp:unifield-server
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/account_reconciliation/account_move_line.py (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-6424
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+372344@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/account_reconciliation/account_move_line.py'
2--- bin/addons/account_reconciliation/account_move_line.py 2019-05-06 16:20:47 +0000
3+++ bin/addons/account_reconciliation/account_move_line.py 2019-09-05 13:46:42 +0000
4@@ -187,7 +187,7 @@
5 total += (line.debit_currency or 0.0) - (line.credit_currency or 0.0)
6
7 if self.pool.get('res.currency').is_zero(cr, uid, company_currency_id, total):
8- res = self.reconcile(cr, uid, merges+unmerge, context=context)
9+ res = self.reconcile(cr, uid, merges+unmerge, type=type, context=context)
10 return res
11 r_id = move_rec_obj.create(cr, uid, {
12 'type': type,

Subscribers

People subscribed via source and target branches