Merge lp:~unifield-team/unifield-addons/us-795-addons into lp:unifield-addons

Proposed by jftempo
Status: Merged
Merged at revision: 4678
Proposed branch: lp:~unifield-team/unifield-addons/us-795-addons
Merge into: lp:unifield-addons
Diff against target: 24 lines (+8/-2)
1 file modified
account/report/account_general_ledger.py (+8/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/us-795-addons
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+283069@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 'account/report/account_general_ledger.py'
2--- account/report/account_general_ledger.py 2015-12-03 13:59:58 +0000
3+++ account/report/account_general_ledger.py 2016-01-19 10:38:54 +0000
4@@ -130,12 +130,18 @@
5 'debit': 0., 'credit': 0., 'balance': 0.,
6 }
7 if deduce_accounts_index:
8+ # compute to deduce amount without any journals filtering
9+ # (by default ikd entries filtered and typically in 8/9 accounts)
10+ deduce_accounts_ctx = used_context.copy()
11+ if 'journal_ids' in deduce_accounts_ctx:
12+ del deduce_accounts_ctx['journal_ids']
13+
14 a_ids = a_obj.search(self.cr, self.uid,
15 [('code', 'in', [ c for c in deduce_accounts_index ])],
16- context=used_context)
17+ context=deduce_accounts_ctx)
18 if a_ids:
19 for account in a_obj.browse(self.cr, self.uid, a_ids,
20- context=used_context):
21+ context=deduce_accounts_ctx):
22 self._deduce_accounts_data['debit'] += account.debit
23 self._deduce_accounts_data['credit'] += account.credit
24 self._deduce_accounts_data['balance'] += \

Subscribers

People subscribed via source and target branches

to all changes: