[FIX] account_financial_report: multicompany+layout behaviour (#498)
* Fix wizards for proper multicompany behaviour. * Fix layout issue
This commit is contained in:
committed by
chaule97
parent
5b14306779
commit
2abb852345
@@ -254,7 +254,6 @@ class GeneralLedgerReportCompute(models.TransientModel):
|
||||
self._inject_partner_values()
|
||||
if not self.filter_partner_ids:
|
||||
self._inject_partner_values(only_empty_partner=True)
|
||||
|
||||
# Add unaffected earnings account
|
||||
if (not self.filter_account_ids or
|
||||
self.unaffected_earnings_account.id in
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<!-- Defines global variables used by internal layout -->
|
||||
<t t-set="title">Aged Partner Balance - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
|
||||
<t t-set="company_name" t-value="o.company_id.name"/>
|
||||
<div class="page data_table">
|
||||
<div class="page">
|
||||
<div class="row">
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'"/>
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'" style="text-align: center;"/>
|
||||
</div>
|
||||
<!-- Display filters -->
|
||||
<t t-call="account_financial_report.report_aged_partner_balance_filters"/>
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
<!-- Defines global variables used by internal layout -->
|
||||
<t t-set="title">General Ledger - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
|
||||
<t t-set="company_name" t-value="o.company_id.name"/>
|
||||
<div class="page data_table">
|
||||
<div class="page">
|
||||
<div class="row">
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'"/>
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'" style="text-align: center;"/>
|
||||
</div>
|
||||
<!-- Display filters -->
|
||||
<t t-call="account_financial_report.report_general_ledger_filters"/>
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<t t-set="display_account_name" t-value="o.with_account_name"/>
|
||||
<t t-set="title">Journal Ledger - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
|
||||
<t t-set="company_name" t-value="o.company_id.name"/>
|
||||
<div class="page data_table">
|
||||
<div class="page">
|
||||
<div class="row">
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'"/>
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'" style="text-align: center;"/>
|
||||
</div>
|
||||
<t t-if="o.group_option == 'none'">
|
||||
<div class="page_break">
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<!-- Defines global variables used by internal layout -->
|
||||
<t t-set="title">Open Items - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
|
||||
<t t-set="company_name" t-value="o.company_id.name"/>
|
||||
<div class="page data_table">
|
||||
<div class="page">
|
||||
<div class="row">
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'"/>
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'" style="text-align: center;"/>
|
||||
</div>
|
||||
<!-- Display filters -->
|
||||
<t t-call="account_financial_report.report_open_items_filters"/>
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
<t t-set="title">Trial Balance - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
|
||||
<t t-set="company_name" t-value="o.company_id.name"/>
|
||||
<t t-set="res_company" t-value="o.company_id"/>
|
||||
<div class="page data_table">
|
||||
<div class="page">
|
||||
<div class="row">
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'"/>
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'" style="text-align: center;"/>
|
||||
</div>
|
||||
<!-- Display filters -->
|
||||
<t t-call="account_financial_report.report_trial_balance_filters"/>
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
<template id="account_financial_report.report_vat_report_base">
|
||||
<t t-set="title">VAT Report - <t t-raw="o.company_id.name"/> - <t t-raw="o.company_id.currency_id.name"/></t>
|
||||
<t t-set="company_name" t-value="o.company_id.name"/>
|
||||
<div class="page data_table">
|
||||
<div class="page">
|
||||
<div class="row">
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'"/>
|
||||
<h4 class="mt0" t-esc="title or 'Odoo Report'" style="text-align: center;"/>
|
||||
</div>
|
||||
<!-- Display filters -->
|
||||
<t t-call="account_financial_report.report_vat_report_filters"/>
|
||||
|
||||
Reference in New Issue
Block a user