Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[IMP] account_financial_report: Add tax_line_id field to taxes column in general_ledger 

TT38721
pull/917/head
Víctor Martínez 2022-09-15 12:01:52 +02:00
parent ff43638c46
commit 4bd43fcbd7
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
account_financial_report/report/general_ledger.py
View File

@ -305,6 +305,7 @@ class GeneralLedgerReport(models.AbstractModel):
"ref": "" if not move_line["ref"] else move_line["ref"], "ref": "" if not move_line["ref"] else move_line["ref"],
"name": "" if not move_line["name"] else move_line["name"], "name": "" if not move_line["name"] else move_line["name"],
"tax_ids": move_line["tax_ids"], "tax_ids": move_line["tax_ids"],
"tax_line_id": move_line["tax_line_id"],
"debit": move_line["debit"], "debit": move_line["debit"],
"credit": move_line["credit"], "credit": move_line["credit"],
"balance": move_line["balance"], "balance": move_line["balance"],
@ -462,6 +463,7 @@ class GeneralLedgerReport(models.AbstractModel):
"currency_id", "currency_id",
"full_reconcile_id", "full_reconcile_id",
"tax_ids", "tax_ids",
"tax_line_id",
"analytic_tag_ids", "analytic_tag_ids",
"amount_currency", "amount_currency",
"ref", "ref",
@ -716,6 +718,7 @@ class GeneralLedgerReport(models.AbstractModel):
"rec_id": 0, "rec_id": 0,
"entry_id": False, "entry_id": False,
"tax_ids": [], "tax_ids": [],
"tax_line_id": False,
"full_reconcile_id": False, "full_reconcile_id": False,
"id": False, "id": False,
"tag_ids": False, "tag_ids": False,

2
account_financial_report/report/general_ledger_xlsx.py
View File

@ -197,6 +197,8 @@ class GeneralLedgerXslx(models.AbstractModel):
tags = "" tags = ""
for tax_id in line["tax_ids"]: for tax_id in line["tax_ids"]:
taxes_description += taxes_data[tax_id]["tax_name"] + " " taxes_description += taxes_data[tax_id]["tax_name"] + " "
if line["tax_line_id"]:
taxes_description += line["tax_line_id"][1]
for tag_id in line["tag_ids"]: for tag_id in line["tag_ids"]:
tags += tags_data[tag_id]["name"] + " " tags += tags_data[tag_id]["name"] + " "
line.update( line.update(

3
account_financial_report/report/templates/general_ledger.xml
View File

@ -445,6 +445,9 @@
/> />
</t> </t>
</t> </t>
<t t-if="line['tax_line_id']">
<span t-esc="line['tax_line_id'][1]" />
</t>
</div> </div>
<!--## partner--> <!--## partner-->
<div class="act_as_cell left"> <div class="act_as_cell left">