Merge lp:~openerp-dev/openobject-addons/trunk-bug-722832-psi into lp:openobject-addons

[Purnendu Singh (OpenERP)]

Hello,

Fixes:(https://bugs.launchpad.net/openobject-addons/+bug/722832)
      Balance Sheet Report - Overall balance calculation error

   Computation Problem of this bug is already fixed by QDP in revision 4724.

My Patch fixes the issue related to the report Balance sheet and P/L layout and added code for Net profit and Net loss with NP and NL.

The patch also fixes the problem KeyError: 'type'
 while generating the balance sheet report.

Thanks,
Purnendu Singh

[Purnendu Singh (OpenERP) (purnendu-singh)]

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

To improve:

1. we can remove "reserve and surplus account" field from wizard and add the line automatically as for profit&loss suggested by qdp
2. Check Net Profit & Net Loss string as per account standards.

Thanks,
mra

review: Needs Fixing

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello,

Here are the list of improvements my merge proposal contains:
1) Added code for "Net Profit" and "Net Loss" accounts.
2) Remove "reserve and surplus account" as decided by QDP and MRA.
3) Improve Report rml accourdingly.
4) Balance sheet report:
     a) In case of Net Profit set amount as negative to avoid any confusion.
     b) Change in the logic of sum_dr() and sum_cr() methods to get correct output in both case (Net profit as well as Net Loss), previously in case of Loss we were getting wrong total on Asset side.

Thanks,
Purnendu Singh

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

b&s report display as per our discussion let us know if you have any changes/improvements (discussed with Accountants).
For your reference: https://bugs.launchpad.net/openobject-addons/+bug/740132

Thanks,
mra

review: Approve

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello,

As Decided to use to improve the order to display the layout accordingly to the "displayed level" of the account.

so, instead of account.level, we must count the number of parents of the account that are displayed on teh report and use that to make the layout

e.g:

    *(level 1) account: 1
            *(level 2) account: 11 (not displayed on reports)
                *(level 3) account: 111
            *(level 2) account: 12
    *(level 1) account: 2
            *(level 2) account: 21

Here, in bold: regular accounts. account 11 has a report_type = / (not shown on BS or PL reports).
Thus in this report, currently we can see accounts 111 and 12 with a different layout.
And that's looking very weird because the account 1 doesn't seem to be the sum of 111 + 12.

That's why we would like to display account accordingly to the "displayed level".

Here accounts 111 and 12 will have same level and will be shown with same layout.

Thanks,
Purnendu Singh

review: Needs Resubmitting

[qdp (OpenERP) (qdp)]

can you split that merge prop in 2: one with the removal of reserve&surplus account

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello,

I have split this merge proposal, Now this branch contains codes for only following changes:

1) Added code for "Net Profit" and "Net Loss" accounts.
2) Improve Report rml accourdingly.
3) Balance sheet report:
     a) In case of Net Profit set amount as negative to avoid any confusion.
     b) Change in the logic of sum_dr() and sum_cr() methods to get correct output in both case (Net profit as well as Net Loss), previously in case of Loss we were getting wrong total on Asset side.
4) instead of account.level, we must count the number of parents of the account that are displayed on teh report and use that to make the layout.
5) And for the removal of reserve and surplus account i will place a new merge proposal with a new brach asap.

Thanks,
Purnendu Singh

review: Needs Resubmitting

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello,

Removal of reserve and surplus account is done in https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-reserve-surplus-account-remove-psi/

above branch also contain update code for Net Profit as NP and Net Loss as NL.

Thanks,
Purnendu Singh

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Conflicts detected can you merge your branch with trunk ?

Thanks.

review: Needs Fixing

[Fabien (Open ERP) (fp-tinyerp)]

seems it was already merged.

[Purnendu Singh (OpenERP) (purnendu-singh)]

hello Fabien,

It seems there is some problem with this branch, because launchpad is not showing any diff in Preview Diff section.

But when i am trying to merge this with main addons i am getting diff.

So, i am proposing merge from a new branch lp:~openerp-dev/openobject-addons/trunk-bug-722832-new-psi for this bug.

Thanks and regards,
Purnendu Singh