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 #1041 into 16.0 

Signed-off-by pedrobaeza
pull/1045/head
OCA-git-bot 2023-05-15 08:08:06 +00:00
parent 8a81da373c d6d2804e49
commit 1a314e239b
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
account_financial_report/report/abstract_report_xlsx.py
View File

@ -531,7 +531,10 @@ class AbstractReportXslx(models.AbstractModel):
format_amt = report_data["formats"]["format_amount"] format_amt = report_data["formats"]["format_amount"]
field_prefix = "format_amount" field_prefix = "format_amount"
if "currency_id" in line_object and line_object.get("currency_id", False): if "currency_id" in line_object and line_object.get("currency_id", False):
currency = line_object["currency_id"] if isinstance(line_object["currency_id"], int):
currency = self.env["res.currency"].browse(line_object["currency_id"])
else:
currency = line_object["currency_id"]
field_name = "{}_{}".format(field_prefix, currency.name) field_name = "{}_{}".format(field_prefix, currency.name)
if hasattr(self, field_name): if hasattr(self, field_name):
format_amt = getattr(self, field_name) format_amt = getattr(self, field_name)

16
account_financial_report/report/general_ledger_xlsx.py
View File

@ -237,6 +237,15 @@ class GeneralLedgerXslx(models.AbstractModel):
# Display array header for move lines # Display array header for move lines
self.write_array_header(report_data) self.write_array_header(report_data)
account.update(
{
"currency_id": accounts_data[account["id"]]["currency_id"],
"currency_name": accounts_data[account["id"]][
"currency_name"
],
}
)
# Display initial balance line for partner # Display initial balance line for partner
group_item.update( group_item.update(
{ {
@ -248,6 +257,9 @@ class GeneralLedgerXslx(models.AbstractModel):
if "grouped_by" in account if "grouped_by" in account
else "", else "",
"currency_id": accounts_data[account["id"]]["currency_id"], "currency_id": accounts_data[account["id"]]["currency_id"],
"currency_name": accounts_data[account["id"]][
"currency_name"
],
} }
) )
if foreign_currency: if foreign_currency:
@ -315,8 +327,6 @@ class GeneralLedgerXslx(models.AbstractModel):
group_item.update( group_item.update(
{ {
"final_bal_curr": group_item["fin_bal"]["bal_curr"], "final_bal_curr": group_item["fin_bal"]["bal_curr"],
"currency_name": group_item["currency_id"].name,
"currency_id": group_item["currency_id"].id,
} }
) )
self.write_ending_balance_from_dict(group_item, report_data) self.write_ending_balance_from_dict(group_item, report_data)
@ -336,8 +346,6 @@ class GeneralLedgerXslx(models.AbstractModel):
account.update( account.update(
{ {
"final_bal_curr": account["fin_bal"]["bal_curr"], "final_bal_curr": account["fin_bal"]["bal_curr"],
"currency_name": account["currency_id"].name,
"currency_id": account["currency_id"].id,
} }
) )
self.write_ending_balance_from_dict(account, report_data) self.write_ending_balance_from_dict(account, report_data)

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

@ -307,6 +307,10 @@
</div> </div>
<t t-if="foreign_currency"> <t t-if="foreign_currency">
<t t-if="account['currency_id']"> <t t-if="account['currency_id']">
<t
t-set="account_currency"
t-value="currency_model.browse(account['currency_id'])"
/>
<div class="act_as_cell amount" style="width: 3.63%;"> <div class="act_as_cell amount" style="width: 3.63%;">
<t t-if="type == 'account_type'"> <t t-if="type == 'account_type'">
<span <span
@ -315,7 +319,7 @@
> >
<t <t
t-out="account_or_group_item_object['init_bal']['bal_curr']" t-out="account_or_group_item_object['init_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/> />
</span> </span>
</t> </t>
@ -326,7 +330,7 @@
> >
<t <t
t-out="account_or_group_item_object['init_bal']['bal_curr']" t-out="account_or_group_item_object['init_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/> />
</span> </span>
</t> </t>
@ -339,7 +343,7 @@
> >
<t <t
t-out="account_or_group_item_object['init_bal']['bal_curr']" t-out="account_or_group_item_object['init_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/> />
</span> </span>
</t> </t>
@ -350,7 +354,7 @@
> >
<t <t
t-out="account_or_group_item_object['init_bal']['bal_curr']" t-out="account_or_group_item_object['init_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/> />
</span> </span>
</t> </t>
@ -699,6 +703,10 @@
<t t-set="misc_grouped_domain" t-value="[]" t-else="" /> <t t-set="misc_grouped_domain" t-value="[]" t-else="" />
<t t-if="foreign_currency"> <t t-if="foreign_currency">
<t t-if="account['currency_id']"> <t t-if="account['currency_id']">
<t
t-set="account_currency"
t-value="currency_model.browse(account['currency_id'])"
/>
<div class="act_as_cell amount" style="width: 3.63%;"> <div class="act_as_cell amount" style="width: 3.63%;">
<t t-if="type == 'account_type'"> <t t-if="type == 'account_type'">
<span> <span>
@ -710,7 +718,7 @@
> >
<t <t
t-out="account_or_group_item_object['fin_bal']['bal_curr']" t-out="account_or_group_item_object['fin_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/> />
</a> </a>
</span> </span>
@ -725,7 +733,7 @@
> >
<t <t
t-out="account_or_group_item_object['fin_bal']['bal_curr']" t-out="account_or_group_item_object['fin_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/> />
</a> </a>
</span> </span>
@ -742,7 +750,7 @@
> >
<t <t
t-out="account_or_group_item_object['fin_bal']['bal_curr']" t-out="account_or_group_item_object['fin_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/> />
</a> </a>
</span> </span>
@ -757,7 +765,7 @@
> >
<t <t
t-out="account_or_group_item_object['fin_bal']['bal_curr']" t-out="account_or_group_item_object['fin_bal']['bal_curr']"
t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}" t-options="{'widget': 'monetary', 'display_currency': account_currency}"
/> />
</a> </a>
</span> </span>