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

Proposed by Stéphane Bidoul (Acsone) on 2013-01-19
Status: Superseded
Proposed branch: lp:~sbi/openobject-addons/trunk-bug1101811
Merge into: lp:openobject-addons
Diff against target: 21 lines (+2/-2)
1 file modified
account/report/account_financial_report.py (+2/-2)
To merge this branch: bzr merge lp:~sbi/openobject-addons/trunk-bug1101811
Reviewer Review Type Date Requested Status
qdp (OpenERP) 2013-02-20 Pending
OpenERP Core Team 2013-01-19 Pending
Review via email: mp+143991@code.launchpad.net

This proposal has been superseded by a proposal from 2013-02-25.

Description of the change

[FIX] account_financial_report: use sign in comparison column

To post a comment you must log in.
qdp (OpenERP) (qdp) 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

Stéphane Bidoul (Acsone) (sbi) wrote :

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 +32 498 72 46 54 | t +32 2 888 3124 | f +32 2 888 3159

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) wrote :

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

qdp (OpenERP) (qdp) wrote :

anyway, it's merged by now

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/report/account_financial_report.py'
2--- account/report/account_financial_report.py 2013-01-07 10:28:57 +0000
3+++ account/report/account_financial_report.py 2013-02-24 22:41:24 +0000
4@@ -65,7 +65,7 @@
5 vals['debit'] = report.debit
6 vals['credit'] = report.credit
7 if data['form']['enable_filter']:
8- vals['balance_cmp'] = self.pool.get('account.financial.report').browse(self.cr, self.uid, report.id, context=data['form']['comparison_context']).balance
9+ 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
10 lines.append(vals)
11 account_ids = []
12 if report.display_detail == 'no_detail':
13@@ -97,7 +97,7 @@
14 if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance']):
15 flag = True
16 if data['form']['enable_filter']:
17- vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance
18+ vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance * report.sign or 0.0
19 if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance_cmp']):
20 flag = True
21 if flag:

Subscribers

People subscribed via source and target branches

to all changes: