Merge lp:~sbi/account-financial-report/account-financial-report-bug1172779 into lp:account-financial-report/trunk

[Stéphane Bidoul (Acsone)]

Proposed fix for lp:1172779 (opening entries in general ledger).

I've tested on 6.1, hence the MP against 6.1, but it should be the same on 7.0.

-sbi

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi,

Thanks for your fix!

It happens that an alternative fix has landed here: https://code.launchpad.net/~account-report-core-editor/account-financial-report/fix-gl-opening-period-show-balance

The 2 approaches are different:
 - You display all the opening entries as individual lines (as it was already done before)
 - The other branch always display sums of opening entries

Upon reflection, we prefer to display the sum, so the numbers are similar to what we see in the trial balance (it does not change too much for accounts with 1 entry, but for customer/supplier accounts, we need to sum the opening entries to correlate with the TB).

Do you bother if the other branch's fix is preferred?

review: Needs Information

[Stéphane Bidoul (Acsone) (sbi)]

Agreed.

On Tue, May 14, 2013 at 3:03 PM, Guewen Baconnier @ Camptocamp <
<email address hidden>> wrote:

> Review: Needs Information
>
> Hi,
>
> Thanks for your fix!
>
> It happens that an alternative fix has landed here:
> https://code.launchpad.net/~account-report-core-editor/account-financial-report/fix-gl-opening-period-show-balance
>
> The 2 approaches are different:
> - You display all the opening entries as individual lines (as it was
> already done before)
> - The other branch always display sums of opening entries
>
> Upon reflection, we prefer to display the sum, so the numbers are similar
> to what we see in the trial balance (it does not change too much for
> accounts with 1 entry, but for customer/supplier accounts, we need to sum
> the opening entries to correlate with the TB).
>
> Do you bother if the other branch's fix is preferred?
> --
>
> https://code.launchpad.net/~sbi/account-financial-report/account-financial-report-bug1172779/+merge/160949
> You are the owner of
> lp:~sbi/account-financial-report/account-financial-report-bug1172779.
>

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> Agreed.

So I'll put the state of this MP to 'Rejected', meaning it won't be merged.

Thanks again

Unmerged revisions

25. By Stéphane Bidoul (Acsone) on 2013-04-25

[FIX] opening entries in webkit general ledger

=== modified file 'account_financial_report_webkit/report/general_ledger.py'
--- account_financial_report_webkit/report/general_ledger.py	2012-03-06 09:13:59 +0000
+++ account_financial_report_webkit/report/general_ledger.py	2013-04-25 16:33:27 +0000
@@ -104,6 +104,9 @@
         accounts = self.get_all_accounts(new_ids, exclude_type=['view'])
         if initial_balance_mode == 'initial_balance':
             init_balance_memoizer = self._compute_initial_balances(accounts, start, fiscalyear)
+        elif initial_balance_mode == 'opening_balance':
+            opening_period_id = self.get_included_opening_period(start_period)[0]
+            start = start_period = self.pool.get('account.period').browse(self.cursor, self.uid, opening_period_id)
 
         ledger_lines_memoizer = self._compute_account_ledger_lines(accounts, init_balance_memoizer,
                                                                    main_filter, target_move, start, stop)