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 PR #995 into 16.0 

Signed-off-by pedrobaeza
pull/998/head
OCA-git-bot 2023-01-17 14:29:19 +00:00
parent 60d4a2ecda a402285fae
commit dad282566a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
account_financial_report/report/general_ledger_xlsx.py
View File

@ -146,7 +146,7 @@ class GeneralLedgerXslx(models.AbstractModel):
# For each account # For each account
for account in general_ledger: for account in general_ledger:
# Write account title # Write account title
total_bal_curr = account["init_bal"].get("bal_curr", 0) total_bal_curr = 0
self.write_array_title( self.write_array_title(
account["code"] + " - " + accounts_data[account["id"]]["name"], account["code"] + " - " + accounts_data[account["id"]]["name"],
report_data, report_data,
@ -235,7 +235,7 @@ class GeneralLedgerXslx(models.AbstractModel):
else: else:
# For each partner # For each partner
total_bal_curr = account["init_bal"]["bal_curr"] total_bal_curr = 0
for group_item in account["list_grouped"]: for group_item in account["list_grouped"]:
# Write partner title # Write partner title
self.write_array_title(group_item["name"], report_data) self.write_array_title(group_item["name"], report_data)

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

@ -363,10 +363,7 @@
</t> </t>
</div> </div>
<!-- Display each lines --> <!-- Display each lines -->
<t <t t-set="total_bal_curr" t-value="0" />
t-set="total_bal_curr"
t-value="account_or_group_item_object['init_bal'].get('bal_curr', 0)"
/>
<t t-foreach="account_or_group_item_object['move_lines']" t-as="line"> <t t-foreach="account_or_group_item_object['move_lines']" t-as="line">
<!-- # lines or centralized lines --> <!-- # lines or centralized lines -->
<div class="act_as_row lines"> <div class="act_as_row lines">