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

Merge 07893e0e77 into b3c6a72a8f

dhx 2025-03-24 18:42:23 +02:00 committed by GitHub
parent b3c6a72a8f 07893e0e77
commit eedc40f447
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
account_financial_report/report/vat_report.py
View File

@ -154,7 +154,12 @@ class VATReport(models.AbstractModel):
tags = self.env["account.account.tag"].browse(tags_ids) tags = self.env["account.account.tag"].browse(tags_ids)
tags_data = {} tags_data = {}
for tag in tags: for tag in tags:
tags_data.update({tag.id: {"code": "", "name": tag.name}}) sign = ""
name = tag.name
if tag.name[0] in ("+", "-"):
name = tag.name[1:]
sign = tag.name[0]
tags_data.update({tag.id: {"code": "", "name": name, "sign": sign}})
return tags_data return tags_data
def _get_vat_report_tag_data(self, vat_report_data, tax_data, tax_detail): def _get_vat_report_tag_data(self, vat_report_data, tax_data, tax_detail):
@ -185,8 +190,10 @@ class VATReport(models.AbstractModel):
vat_report[tag_id]["tax"] += tax_move_line["tax"] vat_report[tag_id]["tax"] += tax_move_line["tax"]
tags_data = self._get_tags_data(vat_report.keys()) tags_data = self._get_tags_data(vat_report.keys())
vat_report_list = [] vat_report_list = []
for tag_id in vat_report.keys(): for tag_id in sorted(
vat_report[tag_id]["name"] = tags_data[tag_id]["name"] vat_report.keys(), key=lambda t: "{code}{name}{sign}".format(**tags_data[t])
):
vat_report[tag_id]["name"] = "{sign}{name}".format(**tags_data[tag_id])
vat_report[tag_id]["code"] = tags_data[tag_id]["code"] vat_report[tag_id]["code"] = tags_data[tag_id]["code"]
if tax_detail: if tax_detail:
vat_report[tag_id]["taxes"] = [] vat_report[tag_id]["taxes"] = []