Account - Financial Report

Merge lp:~vauxoo/account-financial-report/miguel-acc-fin-rep into lp:~vauxoo/account-financial-report/trunk

  1. miguel-acc-fin-rep
  2. Merge into trunk
Proposed by Miguel Delgado (Vauxoo)
Status: Merged
Merged at revision: 8
Proposed branch: lp:~vauxoo/account-financial-report/miguel-acc-fin-rep
Merge into: lp:~vauxoo/account-financial-report/trunk
Diff against target: 53 lines (+6/-6)
3 files modified
account_financial_report/report/account_balance.py (+2/-2)
account_financial_report/report/account_balance_2_cols.py (+2/-2)
account_financial_report/report/account_balance_4_cols.py (+2/-2)
To merge this branch: bzr merge lp:~vauxoo/account-financial-report/miguel-acc-fin-rep
Reviewer Review Type Date Requested Status
Gabriela Quilarque Approve
Review via email: mp+94608@code.launchpad.net

Description of the change

fix bug 940352

To post a comment you must log in.
Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) wrote :

Merge Realizado

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_financial_report/report/account_balance.py'
2--- account_financial_report/report/account_balance.py 2012-01-20 23:34:50 +0000
3+++ account_financial_report/report/account_balance.py 2012-02-24 19:20:23 +0000
4@@ -283,11 +283,11 @@
5 # Check whether we must include this line in the report or not
6 #
7
8- if form['display_account'] == 'bal_mouvement' and account['parent_id']:
9+ if form['display_account'] == 'con_movimiento' and account['parent_id']:
10 # Include accounts with movements
11 if abs(res['balance']) >= 0.5 * 10**-int(2):
12 result_acc.append(res)
13- elif form['display_account'] == 'bal_solde' and account['parent_id']:
14+ elif form['display_account'] == 'con_balance' and account['parent_id']:
15 # Include accounts with balance
16 if abs(res['balance']) >= 0.5 * 10**-int(2):
17 result_acc.append(res)
18
19=== modified file 'account_financial_report/report/account_balance_2_cols.py'
20--- account_financial_report/report/account_balance_2_cols.py 2012-02-09 21:28:52 +0000
21+++ account_financial_report/report/account_balance_2_cols.py 2012-02-24 19:20:23 +0000
22@@ -300,11 +300,11 @@
23 # Check whether we must include this line in the report or not
24 #
25
26- if form['display_account'] == 'bal_mouvement' and account['parent_id']:
27+ if form['display_account'] == 'con_movimiento' and account['parent_id']:
28 # Include accounts with movements
29 if abs(res['balance']) >= 0.5 * 10**-int(2):
30 result_acc.append(res)
31- elif form['display_account'] == 'bal_solde' and account['parent_id']:
32+ elif form['display_account'] == 'con_balance' and account['parent_id']:
33 # Include accounts with balance
34 if abs(res['balance']) >= 0.5 * 10**-4:
35 result_acc.append(res)
36
37=== modified file 'account_financial_report/report/account_balance_4_cols.py'
38--- account_financial_report/report/account_balance_4_cols.py 2012-02-09 21:16:17 +0000
39+++ account_financial_report/report/account_balance_4_cols.py 2012-02-24 19:20:23 +0000
40@@ -300,11 +300,11 @@
41 # Check whether we must include this line in the report or not
42 #
43
44- if form['display_account'] == 'bal_mouvement' and account['parent_id']:
45+ if form['display_account'] == 'con_movimiento' and account['parent_id']:
46 # Include accounts with movements
47 if abs(res['balance']) >= 0.5 * 10**-int(2):
48 result_acc.append(res)
49- elif form['display_account'] == 'bal_solde' and account['parent_id']:
50+ elif form['display_account'] == 'con_balance' and account['parent_id']:
51 # Include accounts with balance
52 if abs(res['balance']) >= 0.5 * 10**-4:
53 result_acc.append(res)

Subscribers

People subscribed via source and target branches

to all changes: