Browse Source

[ADD] Add taxes description in general ledger report

pull/364/head
Benjamin Willig 7 years ago
parent
commit
5867601b5e
  1. 26
      account_financial_report_qweb/report/general_ledger.py
  2. 21
      account_financial_report_qweb/report/general_ledger_xlsx.py
  3. 8
      account_financial_report_qweb/report/templates/general_ledger.xml

26
account_financial_report_qweb/report/general_ledger.py

@ -177,6 +177,7 @@ class GeneralLedgerReportMoveLine(models.TransientModel):
entry = fields.Char()
journal = fields.Char()
account = fields.Char()
taxes_description = fields.Char()
partner = fields.Char()
label = fields.Char()
cost_center = fields.Char()
@ -862,6 +863,7 @@ INSERT INTO
entry,
journal,
account,
taxes_description,
partner,
label,
cost_center,
@ -890,6 +892,28 @@ SELECT
m.name AS entry,
j.code AS journal,
a.code AS account,
CASE
WHEN
ml.tax_line_id is not null
THEN
at.name
WHEN
(SELECT count(*)
FROM account_move_line_account_tax_rel aml_at_rel
WHERE aml_at_rel.account_move_line_id = ml.id
LIMIT 1) > 0
THEN
(SELECT
array_to_string(array_agg(at.name), ', ')
FROM
account_move_line_account_tax_rel aml_at_rel
LEFT JOIN
account_tax at on (at.id = aml_at_rel.account_tax_id)
WHERE
aml_at_rel.account_move_line_id = ml.id)
ELSE
''
END as taxes_description,
"""
if not only_empty_partner_line:
query_inject_move_line += """
@ -960,6 +984,8 @@ INNER JOIN
account_journal j ON ml.journal_id = j.id
INNER JOIN
account_account a ON ml.account_id = a.id
LEFT JOIN
account_tax at ON ml.tax_line_id = at.id
"""
if is_account_line:
query_inject_move_line += """

21
account_financial_report_qweb/report/general_ledger_xlsx.py

@ -25,32 +25,35 @@ class GeneralLedgerXslx(abstract_report_xlsx.AbstractReportXslx):
1: {'header': _('Entry'), 'field': 'entry', 'width': 18},
2: {'header': _('Journal'), 'field': 'journal', 'width': 8},
3: {'header': _('Account'), 'field': 'account', 'width': 9},
4: {'header': _('Partner'), 'field': 'partner', 'width': 25},
5: {'header': _('Ref - Label'), 'field': 'label', 'width': 40},
6: {'header': _('Cost center'),
4: {'header': _('Taxes'),
'field': 'taxes_description',
'width': 15},
5: {'header': _('Partner'), 'field': 'partner', 'width': 25},
6: {'header': _('Ref - Label'), 'field': 'label', 'width': 40},
7: {'header': _('Cost center'),
'field': 'cost_center',
'width': 15},
7: {'header': _('Rec.'), 'field': 'matching_number', 'width': 5},
8: {'header': _('Debit'),
8: {'header': _('Rec.'), 'field': 'matching_number', 'width': 5},
9: {'header': _('Debit'),
'field': 'debit',
'field_initial_balance': 'initial_debit',
'field_final_balance': 'final_debit',
'type': 'amount',
'width': 14},
9: {'header': _('Credit'),
10: {'header': _('Credit'),
'field': 'credit',
'field_initial_balance': 'initial_credit',
'field_final_balance': 'final_credit',
'type': 'amount',
'width': 14},
10: {'header': _('Cumul. Bal.'),
11: {'header': _('Cumul. Bal.'),
'field': 'cumul_balance',
'field_initial_balance': 'initial_balance',
'field_final_balance': 'final_balance',
'type': 'amount',
'width': 14},
11: {'header': _('Cur.'), 'field': 'currency_name', 'width': 7},
12: {'header': _('Amount cur.'),
12: {'header': _('Cur.'), 'field': 'currency_name', 'width': 7},
13: {'header': _('Amount cur.'),
'field': 'amount_currency',
'type': 'amount',
'width': 14},

8
account_financial_report_qweb/report/templates/general_ledger.xml

@ -110,10 +110,12 @@
<div class="act_as_cell" style="width: 40px;">Journal</div>
<!--## account code-->
<div class="act_as_cell" style="width: 50px;">Account</div>
<!--## account code-->
<div class="act_as_cell" style="width: 90px;">Taxes</div>
<!--## partner-->
<div class="act_as_cell" style="width: 140px;">Partner</div>
<!--## ref - label-->
<div class="act_as_cell" style="width: 290px;">Ref - Label</div>
<div class="act_as_cell" style="width: 250px;">Ref - Label</div>
<t t-if="show_cost_center">
<!--## cost_center-->
<div class="act_as_cell" style="width: 100px;">Cost center</div>
@ -145,6 +147,8 @@
<div class="act_as_cell"></div>
<!--## account code-->
<div class="act_as_cell"></div>
<!--## taxes-->
<div class="act_as_cell"></div>
<!--## partner-->
<div class="act_as_cell"></div>
<!--## ref - label-->
@ -181,6 +185,8 @@
<div class="act_as_cell left"><span t-field="line.journal"/></div>
<!--## account code-->
<div class="act_as_cell left"><span t-field="line.account"/></div>
<!--## taxes-->
<div class="act_as_cell left"><span t-field="line.taxes_description"/></div>
<!--## partner-->
<div class="act_as_cell left"><span t-field="line.partner"/></div>
<!--## ref - label-->

Loading…
Cancel
Save