OCA
/
account-financial-reporting
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[FIX] [8.0] Add reference field to account_financial_report_webkit_xls (#107) 

[FIX] [8.0] Add reference field to account_financial_report_webkit_xls
pull/130/merge
Jordi Ballester Alomar 9 years ago
committed by Pedro M. Baeza
parent
94b555e396
commit
d3a36b8909
1 changed files with 10 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      account_financial_report_webkit_xls/report/general_ledger_xls.py

17
account_financial_report_webkit_xls/report/general_ledger_xls.py
View File

@ -37,6 +37,7 @@ _column_sizes = [
('journal', 12), ('journal', 12),
('account_code', 12), ('account_code', 12),
('partner', 30), ('partner', 30),
('ref', 30),
('label', 45), ('label', 45),
('counterpart', 30), ('counterpart', 30),
('debit', 15), ('debit', 15),
@ -165,6 +166,7 @@ class general_ledger_xls(report_xls):
('account_code', 1, 0, 'text', ('account_code', 1, 0, 'text',
_('Account'), None, c_hdr_cell_style), _('Account'), None, c_hdr_cell_style),
('partner', 1, 0, 'text', _('Partner'), 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), ('label', 1, 0, 'text', _('Label'), None, c_hdr_cell_style),
('counterpart', 1, 0, 'text', ('counterpart', 1, 0, 'text',
_('Counterpart'), None, c_hdr_cell_style), _('Counterpart'), None, c_hdr_cell_style),
@ -282,6 +284,7 @@ class general_ledger_xls(report_xls):
('account_code', 1, 0, 'text', account.code), ('account_code', 1, 0, 'text', account.code),
('partner', 1, 0, 'text', ('partner', 1, 0, 'text',
line.get('partner_name') or ''), line.get('partner_name') or ''),
('ref', 1, 0, 'text', line.get('lref')),
('label', 1, 0, 'text', label), ('label', 1, 0, 'text', label),
('counterpart', 1, 0, 'text', ('counterpart', 1, 0, 'text',
line.get('counterparts') or ''), line.get('counterparts') or ''),
@ -306,17 +309,17 @@ class general_ledger_xls(report_xls):
row_pos = self.xls_write_row( row_pos = self.xls_write_row(
ws, row_pos, row_data, ll_cell_style) 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 + ')' 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 + ')' 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 balance_formula = balance_debit + '-' + balance_credit
c_specs = [ c_specs = [
('acc_title', 7, 0, 'text',
('acc_title', 8, 0, 'text',
' - '.join([account.code, account.name])), ' - '.join([account.code, account.name])),
('cum_bal', 1, 0, 'text', ('cum_bal', 1, 0, 'text',
_('Cumulated Balance on Account'), _('Cumulated Balance on Account'),

Write Preview
Loading…
Cancel
Save