From f7bf61aab485e2e2d1985538a5e4a23342276aa5 Mon Sep 17 00:00:00 2001 From: Laetitia Gangloff Date: Wed, 18 Mar 2015 12:06:21 +0100 Subject: [PATCH 1/2] in general ledger report, the sum is done on wrong column --- .../report/general_ledger_xls.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/account_financial_report_webkit_xls/report/general_ledger_xls.py b/account_financial_report_webkit_xls/report/general_ledger_xls.py index 3b3b35ab..545a3236 100644 --- a/account_financial_report_webkit_xls/report/general_ledger_xls.py +++ b/account_financial_report_webkit_xls/report/general_ledger_xls.py @@ -334,14 +334,14 @@ class general_ledger_xls(report_xls): row_pos = self.xls_write_row( ws, row_pos, row_data, ll_cell_style) - debit_start = rowcol_to_cell(row_start, 8) - debit_end = rowcol_to_cell(row_pos - 1, 8) + debit_start = rowcol_to_cell(row_start, 9) + debit_end = rowcol_to_cell(row_pos - 1, 9) debit_formula = 'SUM(' + debit_start + ':' + debit_end + ')' - credit_start = rowcol_to_cell(row_start, 9) - credit_end = rowcol_to_cell(row_pos - 1, 9) + credit_start = rowcol_to_cell(row_start, 10) + credit_end = rowcol_to_cell(row_pos - 1, 10) credit_formula = 'SUM(' + credit_start + ':' + credit_end + ')' - balance_debit = rowcol_to_cell(row_pos, 8) - balance_credit = rowcol_to_cell(row_pos, 9) + balance_debit = rowcol_to_cell(row_pos, 9) + balance_credit = rowcol_to_cell(row_pos, 10) balance_formula = balance_debit + '-' + balance_credit c_specs = [ ('acc_title', COLS_TOT - 4, 0, 'text', From c4c15f0e2418adc4b643b2f3186ef0f0e696e05c Mon Sep 17 00:00:00 2001 From: Laetitia Gangloff Date: Wed, 18 Mar 2015 13:14:37 +0100 Subject: [PATCH 2/2] update range of empty column before initial balance column --- .../report/general_ledger_xls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_financial_report_webkit_xls/report/general_ledger_xls.py b/account_financial_report_webkit_xls/report/general_ledger_xls.py index 545a3236..50ebe827 100644 --- a/account_financial_report_webkit_xls/report/general_ledger_xls.py +++ b/account_financial_report_webkit_xls/report/general_ledger_xls.py @@ -256,7 +256,7 @@ class general_ledger_xls(report_xls): cumul_balance_curr = account.init_balance.get( 'init_balance_currency') or 0.0 c_specs = [('empty%s' % x, 1, 0, 'text', None) - for x in range(6)] + for x in range(7)] c_specs += [ ('init_bal', 1, 0, 'text', _('Initial Balance')), ('counterpart', 1, 0, 'text', None),