Merge lp:~akretion-team/account-financial-report/61-fix-bug-1274194-webkit-xls into lp:~account-report-core-editor/account-financial-report/6.1

Proposed by Alexis de Lattre on 2014-04-24
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp on 2014-05-02
Approved revision: 36
Merged at revision: 36
Proposed branch: lp:~akretion-team/account-financial-report/61-fix-bug-1274194-webkit-xls
Merge into: lp:~account-report-core-editor/account-financial-report/6.1
Diff against target: 16 lines (+3/-3)
1 file modified
account_financial_report_webkit_xls/report/trial_balance_xls.py (+3/-3)
To merge this branch: bzr merge lp:~akretion-team/account-financial-report/61-fix-bug-1274194-webkit-xls
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp Approve on 2014-05-02
St├ęphane Bidoul (Acsone) (community) code review Approve on 2014-04-24
Pedro Manuel Baeza code review 2014-04-24 Approve on 2014-04-24
Review via email: mp+217070@code.launchpad.net
To post a comment you must log in.
Pedro Manuel Baeza (pedro.baeza) wrote :

Also OK.

Thanks.

review: Approve (code review)
St├ęphane Bidoul (Acsone) (sbi) wrote :

tested the 7.0 branche

review: Approve (code review)

LGTM

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_webkit_xls/report/trial_balance_xls.py'
2--- account_financial_report_webkit_xls/report/trial_balance_xls.py 2014-01-27 14:32:33 +0000
3+++ account_financial_report_webkit_xls/report/trial_balance_xls.py 2014-04-24 15:24:58 +0000
4@@ -218,9 +218,9 @@
5 ('account', account_span, 0, 'text', current_account.name),
6 ]
7 if _p.comparison_mode == 'no_comparison':
8-
9- debit_cell = rowcol_to_cell(row_pos, 3)
10- credit_cell = rowcol_to_cell(row_pos, 4)
11+
12+ debit_cell = rowcol_to_cell(row_pos, 4)
13+ credit_cell = rowcol_to_cell(row_pos, 5)
14 bal_formula = debit_cell + '-' + credit_cell
15
16 if _p.initial_balance_mode:

Subscribers

People subscribed via source and target branches

to status/vote changes: