Merge lp:~account-report-core-editor/account-financial-report/fix-gl-opening-period-show-balance-v61 into lp:~account-report-core-editor/account-financial-report/6.1

Proposed by Niels Huylebroeck
Status: Merged
Merged at revision: 25
Proposed branch: lp:~account-report-core-editor/account-financial-report/fix-gl-opening-period-show-balance-v61
Merge into: lp:~account-report-core-editor/account-financial-report/6.1
Diff against target: 12 lines (+2/-0)
1 file modified
account_financial_report_webkit/report/general_ledger.py (+2/-0)
To merge this branch: bzr merge lp:~account-report-core-editor/account-financial-report/fix-gl-opening-period-show-balance-v61
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Review via email: mp+163946@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Niels Huylebroeck (red15) wrote :
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

As for the 7.0 branch I agree and approve for the merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_financial_report_webkit/report/general_ledger.py'
2--- account_financial_report_webkit/report/general_ledger.py 2012-03-06 09:13:59 +0000
3+++ account_financial_report_webkit/report/general_ledger.py 2013-05-15 13:53:35 +0000
4@@ -104,6 +104,8 @@
5 accounts = self.get_all_accounts(new_ids, exclude_type=['view'])
6 if initial_balance_mode == 'initial_balance':
7 init_balance_memoizer = self._compute_initial_balances(accounts, start, fiscalyear)
8+ elif initial_balance_mode == 'opening_balance':
9+ init_balance_memoizer = self._read_opening_balance(accounts, start)
10
11 ledger_lines_memoizer = self._compute_account_ledger_lines(accounts, init_balance_memoizer,
12 main_filter, target_move, start, stop)

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: