Merge lp:~sbi/openobject-addons/trunk-bug1101811 into lp:openobject-addons

[Stéphane Bidoul (Acsone)]

[FIX] account_financial_report: use sign in comparison column

[qdp (OpenERP) (qdp)]

Hello Stéphane,

unfortunatelly, it seems that something went wrong when you did the merge proposal, as while i' trying to merge your branch i'm getting a lot of conflicts. Maybe you solve a conflicts by pushing with --overwrite?

anyway, as the diff in launchpad was clear enough and very short i copied that by the hand.

thanks for the bug spotting and its fixing :-)
Quentin

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

Strange enough. On my side

bzr branch lp:openobject-addons

followsed by

bzr merge lp:~sbi/openobject-addons/trunk-bug1101811

works fine.

-sbi

Stéphane Bidoul
Operations Director | Acsone sa/nv | http://acsone.eu/
m [phone] | t [phone] | f [phone]

On Mon, Feb 25, 2013 at 7:06 PM, qdp (OpenERP) <email address hidden>wrote:

> Hello Stéphane,
>
> unfortunatelly, it seems that something went wrong when you did the merge
> proposal, as while i' trying to merge your branch i'm getting a lot of
> conflicts. Maybe you solve a conflicts by pushing with --overwrite?
>
>
> anyway, as the diff in launchpad was clear enough and very short i copied
> that by the hand.
>
>
> thanks for the bug spotting and its fixing :-)
> Quentin
> --
>
> https://code.launchpad.net/~sbi/openobject-addons/trunk-bug1101811/+merge/143991
> You are the owner of lp:~sbi/openobject-addons/trunk-bug1101811.
>

[qdp (OpenERP) (qdp)]

ho i know... the target branch is the trunk... not the v7

[qdp (OpenERP) (qdp)]

anyway, it's merged by now

=== modified file 'account/report/account_financial_report.py'
--- account/report/account_financial_report.py	2013-01-07 10:28:57 +0000
+++ account/report/account_financial_report.py	2013-02-24 22:41:24 +0000
@@ -65,7 +65,7 @@
                 vals['debit'] = report.debit
                 vals['credit'] = report.credit
             if data['form']['enable_filter']:
-                vals['balance_cmp'] = self.pool.get('account.financial.report').browse(self.cr, self.uid, report.id, context=data['form']['comparison_context']).balance
+                vals['balance_cmp'] = self.pool.get('account.financial.report').browse(self.cr, self.uid, report.id, context=data['form']['comparison_context']).balance * report.sign or 0.0
             lines.append(vals)
             account_ids = []
             if report.display_detail == 'no_detail':
@@ -97,7 +97,7 @@
                     if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance']):
                         flag = True
                     if data['form']['enable_filter']:
-                        vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance
+                        vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance * report.sign or 0.0
                         if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance_cmp']):
                             flag = True
                     if flag: