[FIX] account_financial_report: general_ledger
* centralization is only calculated on accounts where 'centralized' is True * Cumul. Balance of each move_line fixed * Ordering move_lines by date * Fix trial_balance xlsx when not show_partner_details
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
<template id="report_general_ledger_base">
|
||||
<!-- Saved flag fields into variables, used to define columns display -->
|
||||
<t t-set="foreign_currency" t-value="foreign_currency" />
|
||||
<t t-set="filter_partner_ids" t-value="filter_partner_ids" />
|
||||
<!-- Defines global variables used by internal layout -->
|
||||
<t t-set="title">General Ledger - <t t-raw="company_name" /> - <t
|
||||
t-raw="currency_name"
|
||||
@@ -46,50 +47,59 @@
|
||||
>
|
||||
<t t-set="account_or_partner_object" t-value="account" />
|
||||
</t>
|
||||
<!-- Display account footer -->
|
||||
<t
|
||||
t-call="account_financial_report.report_general_ledger_ending_cumul"
|
||||
>
|
||||
<t t-set="account_or_partner_object" t-value="account" />
|
||||
<t t-set="type" t-value='"account_type"' />
|
||||
</t>
|
||||
</t>
|
||||
<t t-if="account['partners']">
|
||||
<!-- Display account partners -->
|
||||
<t t-if="not centralize">
|
||||
<t t-foreach="account['list_partner']" t-as="partner">
|
||||
<t t-set="type" t-value='"partner_type"' />
|
||||
<div class="page_break">
|
||||
<!-- Display partner header -->
|
||||
<div class="act_as_caption account_title">
|
||||
<span
|
||||
t-esc="o._get_atr_from_dict(partner['id'], partners_data, 'name')"
|
||||
/>
|
||||
</div>
|
||||
<!-- Display partner move lines -->
|
||||
<t t-foreach="account['list_partner']" t-as="partner">
|
||||
<t t-set="type" t-value='"partner_type"' />
|
||||
<div class="page_break">
|
||||
<!-- Display partner header -->
|
||||
<div class="act_as_caption account_title">
|
||||
<span
|
||||
t-esc="o._get_atr_from_dict(partner['id'], partners_data, 'name')"
|
||||
/>
|
||||
</div>
|
||||
<!-- Display partner move lines -->
|
||||
<t
|
||||
t-call="account_financial_report.report_general_ledger_lines"
|
||||
>
|
||||
<t
|
||||
t-call="account_financial_report.report_general_ledger_lines"
|
||||
>
|
||||
<t
|
||||
t-set="account_or_partner_object"
|
||||
t-value="partner"
|
||||
/>
|
||||
</t>
|
||||
<!-- Display partner footer -->
|
||||
t-set="account_or_partner_object"
|
||||
t-value="partner"
|
||||
/>
|
||||
</t>
|
||||
<!-- Display partner footer -->
|
||||
<t
|
||||
t-call="account_financial_report.report_general_ledger_ending_cumul"
|
||||
>
|
||||
<t
|
||||
t-set="account_or_partner_object"
|
||||
t-value="partner"
|
||||
/>
|
||||
<t t-set="type" t-value='"partner_type"' />
|
||||
</t>
|
||||
<!-- Display account footer -->
|
||||
<t t-if="not filter_partner_ids">
|
||||
<t
|
||||
t-call="account_financial_report.report_general_ledger_ending_cumul"
|
||||
>
|
||||
<t
|
||||
t-set="account_or_partner_object"
|
||||
t-value="partner"
|
||||
t-value="account"
|
||||
/>
|
||||
<t t-set="type" t-value='"partner_type"' />
|
||||
<t t-set="type" t-value='"account_type"' />
|
||||
</t>
|
||||
</div>
|
||||
</t>
|
||||
</t>
|
||||
</div>
|
||||
</t>
|
||||
</t>
|
||||
<!-- Display account footer -->
|
||||
<t
|
||||
t-if="not account['partners']"
|
||||
t-call="account_financial_report.report_general_ledger_ending_cumul"
|
||||
>
|
||||
<t t-set="account_or_partner_object" t-value="account" />
|
||||
<t t-set="type" t-value='"account_type"' />
|
||||
</t>
|
||||
</div>
|
||||
</t>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user