OCA
/
account-financial-reporting
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[account_financial_report][fix] Various fixes related to multicompany 

- Display the currency of the company that was selected by the user, not
  the company that the user is currently active on.
- In the wizards, show only the companies that the user has chosen to work on,
  instead of all companies.
pull/772/head
Jordi Ballester 4 years ago
committed by Mateu Griful
parent
76102ef4a0
commit
cf4c2d39f8
9 changed files with 93 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      account_financial_report/report/aged_partner_balance.py
  2. 1
      account_financial_report/report/open_items.py
  3. 82
      account_financial_report/report/templates/aged_partner_balance.xml
  4. 30
      account_financial_report/report/templates/general_ledger.xml
  5. 8
      account_financial_report/report/templates/open_items.xml
  6. 50
      account_financial_report/report/templates/trial_balance.xml
  7. 8
      account_financial_report/report/templates/vat_report.xml
  8. 1
      account_financial_report/report/vat_report.py
  9. 1
      account_financial_report/wizard/abstract_wizard.py

1
account_financial_report/report/aged_partner_balance.py
View File

@ -369,6 +369,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
"doc_model": "open.items.report.wizard", "doc_model": "open.items.report.wizard",
"docs": self.env["open.items.report.wizard"].browse(wizard_id), "docs": self.env["open.items.report.wizard"].browse(wizard_id),
"company_name": company.display_name, "company_name": company.display_name,
"company_currency": company.currency_id,
"currency_name": company.currency_id.name, "currency_name": company.currency_id.name,
"date_at": date_at, "date_at": date_at,
"only_posted_moves": only_posted_moves, "only_posted_moves": only_posted_moves,

1
account_financial_report/report/open_items.py
View File

@ -258,6 +258,7 @@ class OpenItemsReport(models.AbstractModel):
"foreign_currency": data["foreign_currency"], "foreign_currency": data["foreign_currency"],
"show_partner_details": data["show_partner_details"], "show_partner_details": data["show_partner_details"],
"company_name": company.display_name, "company_name": company.display_name,
"company_currency": company.currency_id,
"currency_name": company.currency_id.name, "currency_name": company.currency_id.name,
"date_at": date_at_object.strftime("%d/%m/%Y"), "date_at": date_at_object.strftime("%d/%m/%Y"),
"hide_account_at_0": data["hide_account_at_0"], "hide_account_at_0": data["hide_account_at_0"],

82
account_financial_report/report/templates/aged_partner_balance.xml
View File

@ -137,49 +137,49 @@
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<span <span
t-esc="partner['residual']" t-esc="partner['residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## current--> <!--## current-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<span <span
t-esc="partner['current']" t-esc="partner['current']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_30_days--> <!--## age_30_days-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<span <span
t-esc="partner['30_days']" t-esc="partner['30_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_60_days--> <!--## age_60_days-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<span <span
t-esc="partner['60_days']" t-esc="partner['60_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_90_days--> <!--## age_90_days-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<span <span
t-esc="partner['90_days']" t-esc="partner['90_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_120_days--> <!--## age_120_days-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<span <span
t-esc="partner['120_days']" t-esc="partner['120_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## older--> <!--## older-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<span <span
t-esc="partner['older']" t-esc="partner['older']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
</div> </div>
@ -315,7 +315,7 @@
> >
<t <t
t-raw="line['residual']" t-raw="line['residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</div> </div>
@ -324,7 +324,7 @@
<t t-if="line.current == 0"> <t t-if="line.current == 0">
<span <span
t-field="line.current" t-field="line.current"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</t> </t>
<t t-else=""> <t t-else="">
@ -334,7 +334,7 @@
> >
<t <t
t-raw="line['current']" t-raw="line['current']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -344,7 +344,7 @@
<t t-if="line.age_30_days == 0"> <t t-if="line.age_30_days == 0">
<span <span
t-field="line.age_30_days" t-field="line.age_30_days"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</t> </t>
<t t-else=""> <t t-else="">
@ -354,7 +354,7 @@
> >
<t <t
t-raw="line['30_days']" t-raw="line['30_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -364,7 +364,7 @@
<t t-if="line.age_60_days == 0"> <t t-if="line.age_60_days == 0">
<span <span
t-field="line.age_60_days" t-field="line.age_60_days"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</t> </t>
<t t-else=""> <t t-else="">
@ -374,7 +374,7 @@
> >
<t <t
t-raw="line['60_days']" t-raw="line['60_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -384,7 +384,7 @@
<t t-if="line.age_90_days == 0"> <t t-if="line.age_90_days == 0">
<span <span
t-field="line.age_90_days" t-field="line.age_90_days"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</t> </t>
<t t-else=""> <t t-else="">
@ -394,7 +394,7 @@
> >
<t <t
t-raw="line['90_days']" t-raw="line['90_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -404,7 +404,7 @@
<t t-if="line.age_120_days == 0"> <t t-if="line.age_120_days == 0">
<span <span
t-field="line.age_120_days" t-field="line.age_120_days"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</t> </t>
<t t-else=""> <t t-else="">
@ -414,7 +414,7 @@
> >
<t <t
t-raw="line['120_days']" t-raw="line['120_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -424,7 +424,7 @@
<t t-if="line.older == 0"> <t t-if="line.older == 0">
<span <span
t-field="line.older" t-field="line.older"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</t> </t>
<t t-else=""> <t t-else="">
@ -434,7 +434,7 @@
> >
<t <t
t-raw="line['older']" t-raw="line['older']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -456,49 +456,49 @@
<div class="act_as_cell amount" style="width: 6.00%;"> <div class="act_as_cell amount" style="width: 6.00%;">
<span <span
t-esc="partner_cumul_line['residual']" t-esc="partner_cumul_line['residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## current--> <!--## current-->
<div class="act_as_cell amount" style="width: 6.00%;"> <div class="act_as_cell amount" style="width: 6.00%;">
<span <span
t-esc="partner_cumul_line['current']" t-esc="partner_cumul_line['current']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_30_days--> <!--## age_30_days-->
<div class="act_as_cell amount" style="width: 6.00%;"> <div class="act_as_cell amount" style="width: 6.00%;">
<span <span
t-esc="partner_cumul_line['30_days']" t-esc="partner_cumul_line['30_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_60_days--> <!--## age_60_days-->
<div class="act_as_cell amount" style="width: 6.00%;"> <div class="act_as_cell amount" style="width: 6.00%;">
<span <span
t-esc="partner_cumul_line['60_days']" t-esc="partner_cumul_line['60_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_90_days--> <!--## age_90_days-->
<div class="act_as_cell amount" style="width: 6.00%;"> <div class="act_as_cell amount" style="width: 6.00%;">
<span <span
t-esc="partner_cumul_line['90_days']" t-esc="partner_cumul_line['90_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_120_days--> <!--## age_120_days-->
<div class="act_as_cell amount" style="width: 6.00%;"> <div class="act_as_cell amount" style="width: 6.00%;">
<span <span
t-esc="partner_cumul_line['120_days']" t-esc="partner_cumul_line['120_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## older--> <!--## older-->
<div class="act_as_cell amount" style="width: 6.00%;"> <div class="act_as_cell amount" style="width: 6.00%;">
<span <span
t-esc="partner_cumul_line['older']" t-esc="partner_cumul_line['older']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
</div> </div>
@ -515,49 +515,49 @@
<div class="act_as_cell amount" style="width: 9.64%;"> <div class="act_as_cell amount" style="width: 9.64%;">
<span <span
t-esc="account['residual']" t-esc="account['residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## current--> <!--## current-->
<div class="act_as_cell amount" style="width: 9.64%;"> <div class="act_as_cell amount" style="width: 9.64%;">
<span <span
t-esc="account['current']" t-esc="account['current']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_30_days--> <!--## age_30_days-->
<div class="act_as_cell amount" style="width: 9.64%;"> <div class="act_as_cell amount" style="width: 9.64%;">
<span <span
t-esc="account['30_days']" t-esc="account['30_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_60_days--> <!--## age_60_days-->
<div class="act_as_cell amount" style="width: 9.64%;"> <div class="act_as_cell amount" style="width: 9.64%;">
<span <span
t-esc="account['60_days']" t-esc="account['60_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_90_days--> <!--## age_90_days-->
<div class="act_as_cell amount" style="width: 9.64%;"> <div class="act_as_cell amount" style="width: 9.64%;">
<span <span
t-esc="account['90_days']" t-esc="account['90_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_120_days--> <!--## age_120_days-->
<div class="act_as_cell amount" style="width: 9.64%;"> <div class="act_as_cell amount" style="width: 9.64%;">
<span <span
t-esc="account['120_days']" t-esc="account['120_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## older--> <!--## older-->
<div class="act_as_cell amount" style="width: 9.64%;"> <div class="act_as_cell amount" style="width: 9.64%;">
<span <span
t-esc="account['older']" t-esc="account['older']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
</t> </t>
@ -570,49 +570,49 @@
<div class="act_as_cell amount" style="width: 6.00%"> <div class="act_as_cell amount" style="width: 6.00%">
<span <span
t-esc="account['residual']" t-esc="account['residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## current--> <!--## current-->
<div class="act_as_cell amount" style="width: 6.00%"> <div class="act_as_cell amount" style="width: 6.00%">
<span <span
t-esc="account['current']" t-esc="account['current']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_30_days--> <!--## age_30_days-->
<div class="act_as_cell amount" style="width: 6.00%"> <div class="act_as_cell amount" style="width: 6.00%">
<span <span
t-esc="account['30_days']" t-esc="account['30_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_60_days--> <!--## age_60_days-->
<div class="act_as_cell amount" style="width: 6.00%"> <div class="act_as_cell amount" style="width: 6.00%">
<span <span
t-esc="account['60_days']" t-esc="account['60_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_90_days--> <!--## age_90_days-->
<div class="act_as_cell amount" style="width: 6.00%"> <div class="act_as_cell amount" style="width: 6.00%">
<span <span
t-esc="account['90_days']" t-esc="account['90_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## age_120_days--> <!--## age_120_days-->
<div class="act_as_cell amount" style="width: 6.00%"> <div class="act_as_cell amount" style="width: 6.00%">
<span <span
t-esc="account['120_days']" t-esc="account['120_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## older--> <!--## older-->
<div class="act_as_cell amount" style="width: 6.00%"> <div class="act_as_cell amount" style="width: 6.00%">
<span <span
t-esc="account['older']" t-esc="account['older']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
</t> </t>

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

@ -229,7 +229,7 @@
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-raw="account_or_partner_object['init_bal']['debit']" t-raw="account_or_partner_object['init_bal']['debit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -244,7 +244,7 @@
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-raw="account_or_partner_object['init_bal']['debit']" t-raw="account_or_partner_object['init_bal']['debit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -261,7 +261,7 @@
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-raw="account_or_partner_object['init_bal']['credit']" t-raw="account_or_partner_object['init_bal']['credit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -276,7 +276,7 @@
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-raw="account_or_partner_object['init_bal']['credit']" t-raw="account_or_partner_object['init_bal']['credit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -292,7 +292,7 @@
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-raw="account_or_partner_object['init_bal']['balance']" t-raw="account_or_partner_object['init_bal']['balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -306,7 +306,7 @@
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-raw="account_or_partner_object['init_bal']['balance']" t-raw="account_or_partner_object['init_bal']['balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -516,7 +516,7 @@
> >
<t <t
t-raw="line['debit']" t-raw="line['debit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -524,7 +524,7 @@
<span> <span>
<t <t
t-raw="line['debit']" t-raw="line['debit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -539,7 +539,7 @@
> >
<t <t
t-raw="line['credit']" t-raw="line['credit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -547,7 +547,7 @@
<span> <span>
<t <t
t-raw="line['credit']" t-raw="line['credit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -562,7 +562,7 @@
> >
<t <t
t-raw="line['balance']" t-raw="line['balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -570,7 +570,7 @@
<span> <span>
<t <t
t-raw="line['balance']" t-raw="line['balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -640,21 +640,21 @@
<div class="act_as_cell amount" style="width: 8.02%;"> <div class="act_as_cell amount" style="width: 8.02%;">
<span <span
t-esc="account_or_partner_object['fin_bal']['debit']" t-esc="account_or_partner_object['fin_bal']['debit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## credit--> <!--## credit-->
<div class="act_as_cell amount" style="width: 8.02%;"> <div class="act_as_cell amount" style="width: 8.02%;">
<span <span
t-esc="account_or_partner_object['fin_bal']['credit']" t-esc="account_or_partner_object['fin_bal']['credit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## balance cumulated--> <!--## balance cumulated-->
<div class="act_as_cell amount" style="width: 8.02%;"> <div class="act_as_cell amount" style="width: 8.02%;">
<span <span
t-esc="account_or_partner_object['fin_bal']['balance']" t-esc="account_or_partner_object['fin_bal']['balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## currency_name + amount_currency--> <!--## currency_name + amount_currency-->

8
account_financial_report/report/templates/open_items.xml
View File

@ -210,14 +210,14 @@
<span <span
t-if="line.get('original', False)" t-if="line.get('original', False)"
t-esc="line['original']" t-esc="line['original']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## amount_residual--> <!--## amount_residual-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<span <span
t-esc="line['amount_residual']" t-esc="line['amount_residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<t t-if="foreign_currency"> <t t-if="foreign_currency">
@ -276,13 +276,13 @@
<t t-if='type == "account_type"'> <t t-if='type == "account_type"'>
<span <span
t-esc="total_amount[account_id]['residual']" t-esc="total_amount[account_id]['residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</t> </t>
<t t-if='type == "partner_type"'> <t t-if='type == "partner_type"'>
<span <span
t-esc="total_amount[account_id][partner_id]['residual']" t-esc="total_amount[account_id][partner_id]['residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</t> </t>
</div> </div>

50
account_financial_report/report/templates/trial_balance.xml
View File

@ -300,7 +300,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-esc="balance['initial_balance']" t-esc="balance['initial_balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -314,7 +314,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="balance['initial_balance']" t-raw="balance['initial_balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -330,7 +330,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="total_amount[account_id][partner_id]['initial_balance']" t-raw="total_amount[account_id][partner_id]['initial_balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -350,7 +350,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-esc="balance['debit']" t-esc="balance['debit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -366,7 +366,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="balance['debit']" t-raw="balance['debit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -384,7 +384,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="total_amount[account_id][partner_id]['debit']" t-raw="total_amount[account_id][partner_id]['debit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -404,7 +404,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-esc="balance['credit']" t-esc="balance['credit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -420,7 +420,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="balance['credit']" t-raw="balance['credit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -438,7 +438,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="total_amount[account_id][partner_id]['credit']" t-raw="total_amount[account_id][partner_id]['credit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -458,7 +458,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-esc="balance['balance']" t-esc="balance['balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -473,7 +473,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="balance['balance']" t-raw="balance['balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -491,7 +491,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="total_amount[account_id][partner_id]['balance']" t-raw="total_amount[account_id][partner_id]['balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -509,7 +509,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-esc="balance['ending_balance']" t-esc="balance['ending_balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -522,7 +522,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="balance['ending_balance']" t-raw="balance['ending_balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -538,7 +538,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-esc="total_amount[account_id][partner_id]['ending_balance']" t-esc="total_amount[account_id][partner_id]['ending_balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</t> </t>
@ -716,7 +716,7 @@
<!-- t-att-data-res-model="'account.move.line'"--> <!-- t-att-data-res-model="'account.move.line'"-->
<!-- class="o_account_financial_reports_web_action_monetary_multi"--> <!-- class="o_account_financial_reports_web_action_monetary_multi"-->
<!-- t-att-style="style">--> <!-- t-att-style="style">-->
<!-- <t t-att-style="style" t-raw="account.initial_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
<!-- <t t-att-style="style" t-raw="account.initial_balance" t-options="{'widget': 'monetary', 'display_currency': company_currency}"/></a>-->
<!-- </span>--> <!-- </span>-->
<!-- </div>--> <!-- </div>-->
<!-- &lt;!&ndash;## Debit&ndash;&gt;--> <!-- &lt;!&ndash;## Debit&ndash;&gt;-->
@ -731,7 +731,7 @@
<!-- t-att-data-res-model="'account.move.line'"--> <!-- t-att-data-res-model="'account.move.line'"-->
<!-- class="o_account_financial_reports_web_action_monetary_multi"--> <!-- class="o_account_financial_reports_web_action_monetary_multi"-->
<!-- t-att-style="style">--> <!-- t-att-style="style">-->
<!-- <t t-att-style="style" t-raw="account.debit" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
<!-- <t t-att-style="style" t-raw="account.debit" t-options="{'widget': 'monetary', 'display_currency': company_currency}"/></a>-->
<!-- </span>--> <!-- </span>-->
<!-- </div>--> <!-- </div>-->
<!-- &lt;!&ndash;## Credit&ndash;&gt;--> <!-- &lt;!&ndash;## Credit&ndash;&gt;-->
@ -746,7 +746,7 @@
<!-- t-att-data-res-model="'account.move.line'"--> <!-- t-att-data-res-model="'account.move.line'"-->
<!-- class="o_account_financial_reports_web_action_monetary_multi"--> <!-- class="o_account_financial_reports_web_action_monetary_multi"-->
<!-- t-att-style="style">--> <!-- t-att-style="style">-->
<!-- <t t-att-style="style" t-raw="account.credit" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
<!-- <t t-att-style="style" t-raw="account.credit" t-options="{'widget': 'monetary', 'display_currency': company_currency}"/></a>-->
<!-- </span>--> <!-- </span>-->
<!-- </div>--> <!-- </div>-->
<!-- &lt;!&ndash;## Period Balance &ndash;&gt;--> <!-- &lt;!&ndash;## Period Balance &ndash;&gt;-->
@ -761,7 +761,7 @@
<!-- t-att-data-res-model="'account.move.line'"--> <!-- t-att-data-res-model="'account.move.line'"-->
<!-- class="o_account_financial_reports_web_action_monetary_multi"--> <!-- class="o_account_financial_reports_web_action_monetary_multi"-->
<!-- t-att-style="style">--> <!-- t-att-style="style">-->
<!-- <t t-att-style="style" t-raw="account.period_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
<!-- <t t-att-style="style" t-raw="account.period_balance" t-options="{'widget': 'monetary', 'display_currency': company_currency}"/></a>-->
<!-- </span>--> <!-- </span>-->
<!-- </div>--> <!-- </div>-->
<!-- &lt;!&ndash;## Ending balance&ndash;&gt;--> <!-- &lt;!&ndash;## Ending balance&ndash;&gt;-->
@ -773,7 +773,7 @@
<!-- t-att-data-res-model="'account.move.line'"--> <!-- t-att-data-res-model="'account.move.line'"-->
<!-- class="o_account_financial_reports_web_action_monetary_multi"--> <!-- class="o_account_financial_reports_web_action_monetary_multi"-->
<!-- t-att-style="style" >--> <!-- t-att-style="style" >-->
<!-- <t t-att-style="style" t-raw="account.final_balance" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/></a>-->
<!-- <t t-att-style="style" t-raw="account.final_balance" t-options="{'widget': 'monetary', 'display_currency': company_currency}"/></a>-->
<!-- </span>--> <!-- </span>-->
<!-- </div>--> <!-- </div>-->
<!-- <t t-if="foreign_currency">--> <!-- <t t-if="foreign_currency">-->
@ -832,35 +832,35 @@
<div class="act_as_cell amount" style="width: 9%;"> <div class="act_as_cell amount" style="width: 9%;">
<span <span
t-esc="total_amount[account_id]['initial_balance']" t-esc="total_amount[account_id]['initial_balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## Debit--> <!--## Debit-->
<div class="act_as_cell amount" style="width: 9%;"> <div class="act_as_cell amount" style="width: 9%;">
<span <span
t-esc="total_amount[account_id]['debit']" t-esc="total_amount[account_id]['debit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## Credit--> <!--## Credit-->
<div class="act_as_cell amount" style="width: 9%;"> <div class="act_as_cell amount" style="width: 9%;">
<span <span
t-esc="total_amount[account_id]['credit']" t-esc="total_amount[account_id]['credit']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## Period balance--> <!--## Period balance-->
<div class="act_as_cell amount" style="width: 9%;"> <div class="act_as_cell amount" style="width: 9%;">
<span <span
t-esc="total_amount[account_id]['balance']" t-esc="total_amount[account_id]['balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<!--## Ending balance--> <!--## Ending balance-->
<div class="act_as_cell amount" style="width: 9%;"> <div class="act_as_cell amount" style="width: 9%;">
<span <span
t-esc="total_amount[account_id]['ending_balance']" t-esc="total_amount[account_id]['ending_balance']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<t t-if="foreign_currency"> <t t-if="foreign_currency">

8
account_financial_report/report/templates/vat_report.xml
View File

@ -72,14 +72,14 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="tag_or_group['net']" t-raw="tag_or_group['net']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
<div class="act_as_cell amount" style="width: 15%;"> <div class="act_as_cell amount" style="width: 15%;">
<t <t
t-att-style="style" t-att-style="style"
t-raw="tag_or_group['tax']" t-raw="tag_or_group['tax']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</div> </div>
</div> </div>
@ -114,7 +114,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="tax['net']" t-raw="tax['net']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</div> </div>
@ -133,7 +133,7 @@
<t <t
t-att-style="style" t-att-style="style"
t-raw="tax['tax']" t-raw="tax['tax']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
t-options="{'widget': 'monetary', 'display_currency': company_currency}"
/> />
</span> </span>
</div> </div>

1
account_financial_report/report/vat_report.py
View File

@ -229,6 +229,7 @@ class VATReport(models.AbstractModel):
"doc_model": "open.items.report.wizard", "doc_model": "open.items.report.wizard",
"docs": self.env["open.items.report.wizard"].browse(wizard_id), "docs": self.env["open.items.report.wizard"].browse(wizard_id),
"company_name": company.display_name, "company_name": company.display_name,
"company_currency": company.currency_id,
"currency_name": company.currency_id.name, "currency_name": company.currency_id.name,
"date_to": data["date_to"], "date_to": data["date_to"],
"date_from": data["date_from"], "date_from": data["date_from"],

1
account_financial_report/wizard/abstract_wizard.py
View File

@ -33,6 +33,7 @@ class AbstractWizard(models.AbstractModel):
default=lambda self: self.env.company.id, default=lambda self: self.env.company.id,
required=False, required=False,
string="Company", string="Company",
domain=lambda self: [("id", "in", self.env.companies.ids)],
) )
def button_export_html(self): def button_export_html(self):

Write Preview
Loading…
Cancel
Save