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 52a3d759..58c0e905 100644 --- a/account_financial_report_webkit_xls/report/general_ledger_xls.py +++ b/account_financial_report_webkit_xls/report/general_ledger_xls.py @@ -37,6 +37,7 @@ _column_sizes = [ ('journal', 12), ('account_code', 12), ('partner', 30), + ('ref', 30), ('label', 45), ('counterpart', 30), ('debit', 15), @@ -165,6 +166,7 @@ class general_ledger_xls(report_xls): ('account_code', 1, 0, 'text', _('Account'), None, c_hdr_cell_style), ('partner', 1, 0, 'text', _('Partner'), None, c_hdr_cell_style), + ('ref', 1, 0, 'text', _('Reference'), None, c_hdr_cell_style), ('label', 1, 0, 'text', _('Label'), None, c_hdr_cell_style), ('counterpart', 1, 0, 'text', _('Counterpart'), None, c_hdr_cell_style), @@ -282,6 +284,7 @@ class general_ledger_xls(report_xls): ('account_code', 1, 0, 'text', account.code), ('partner', 1, 0, 'text', line.get('partner_name') or ''), + ('ref', 1, 0, 'text', line.get('lref')), ('label', 1, 0, 'text', label), ('counterpart', 1, 0, 'text', line.get('counterparts') or ''), @@ -306,17 +309,17 @@ 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', 7, 0, 'text', + ('acc_title', 8, 0, 'text', ' - '.join([account.code, account.name])), ('cum_bal', 1, 0, 'text', _('Cumulated Balance on Account'),