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

Proposed by Niels Huylebroeck
Status: Merged
Merged at revision: 29
Proposed branch: lp:~account-report-core-editor/account-financial-report/fix-gl-opening-period-show-balance
Merge into: lp:~account-report-core-editor/account-financial-report/7.0
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
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review and test Approve
Review via email: mp+163703@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Thanks for your merge proposal.

I tested it, works fine.

I prefer it over the other proposal for the same issue: https://code.launchpad.net/~sbi/account-financial-report/account-financial-report-bug1172779/+merge/160949

review: Approve (code review and test)
Revision history for this message
Stéphane Bidoul (Acsone) (sbi) wrote :

I tested it on the 6.1 branch. Works fine for me too.

Do you mind merging this one in the 6.1 branch too?

Thanks,

-sbi

Revision history for this message
Niels Huylebroeck (red15) wrote :

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-12-11 16:32:26 +0000
3+++ account_financial_report_webkit/report/general_ledger.py 2013-05-14 13:05:33 +0000
4@@ -105,6 +105,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 status/vote changes: