tocmo0nlord/Odoo-18.0-20251222
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[IMP] account_financial_report: pre-commit auto fixes

Browse Source
This commit is contained in:
chaule97
2024-11-13 10:18:04 +07:00
parent 4413611f93
commit c46e83a4a4
16 changed files with 257 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
account_financial_report/README.rst
View File

@@ -17,13 +17,13 @@ Account Financial Reports
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3 :alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github
:target: https://github.com/OCA/account-financial-reporting/tree/17.0/account_financial_report :target: https://github.com/OCA/account-financial-reporting/tree/18.0/account_financial_report
:alt: OCA/account-financial-reporting :alt: OCA/account-financial-reporting
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/account-financial-reporting-17-0/account-financial-reporting-17-0-account_financial_report :target: https://translation.odoo-community.org/projects/account-financial-reporting-18-0/account-financial-reporting-18-0-account_financial_report
:alt: Translate me on Weblate :alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=17.0 :target: https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=18.0
:alt: Try me on Runboat :alt: Try me on Runboat
|badge1| |badge2| |badge3| |badge4| |badge5| |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -31,12 +31,12 @@ Account Financial Reports
This module adds a set of financial reports. They are accessible under This module adds a set of financial reports. They are accessible under
Invoicing / Reporting / OCA accounting reports. Invoicing / Reporting / OCA accounting reports.
- General ledger - General ledger
- Trial Balance - Trial Balance
- Open Items - Open Items
- Aged Partner Balance - Aged Partner Balance
- VAT Report - VAT Report
- Journal Ledger - Journal Ledger
Currently General ledger, Trial Balance and Open Items are fully Currently General ledger, Trial Balance and Open Items are fully
compatible with a foreign currency set up in account in order to display compatible with a foreign currency set up in account in order to display
@@ -90,12 +90,12 @@ per company in:
Known issues / Roadmap Known issues / Roadmap
====================== ======================
- 'VAT Report' is valid only for cases where it's met that for each Tax - 'VAT Report' is valid only for cases where it's met that for each Tax
defined: all the "Account tags" of all the 'Repartition for Invoices' defined: all the "Account tags" of all the 'Repartition for Invoices'
or 'Repartition for Credit Notes' are different. or 'Repartition for Credit Notes' are different.
- It would be nice to have in reports a column indicating the state of - It would be nice to have in reports a column indicating the state of
the entries when the option "All Entries" is selected in "Target the entries when the option "All Entries" is selected in "Target
Moves" field in a wizard Moves" field in a wizard
Changelog Changelog
========= =========
@@ -103,22 +103,22 @@ Changelog
11.0.2.5.0 (2019-04-26) 11.0.2.5.0 (2019-04-26)
----------------------- -----------------------
- In the Trial Balance you have an option to hide parent hierarchy - In the Trial Balance you have an option to hide parent hierarchy
levels levels
11.0.2.4.1 (2019-01-08) 11.0.2.4.1 (2019-01-08)
----------------------- -----------------------
- Handle better multicompany behaviour - Handle better multicompany behaviour
- Improve how title appears in the reports - Improve how title appears in the reports
- Improve performance in General Ledger - Improve performance in General Ledger
11.0.2.3.1 (2018-11-29) 11.0.2.3.1 (2018-11-29)
----------------------- -----------------------
- In the Trial Balance you can apply a filter by hierarchy levels - In the Trial Balance you can apply a filter by hierarchy levels
- In the General Ledger you can apply a filter by Analytic Tag - In the General Ledger you can apply a filter by Analytic Tag
- In the Journal Ledger the field 'Journal' is now optional - In the Journal Ledger the field 'Journal' is now optional
Bug Tracker Bug Tracker
=========== ===========
@@ -126,7 +126,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-financial-reporting/issues>`_. Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-financial-reporting/issues>`_.
In case of trouble, please check there if your issue has already been reported. In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20account_financial_report%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. `feedback <https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20account_financial_report%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues. Do not contact contributors directly about support or help with technical issues.
@@ -144,42 +144,42 @@ Authors
Contributors Contributors
------------ ------------
- Jordi Ballester <jordi.ballester@forgeflow.com> - Jordi Ballester <jordi.ballester@forgeflow.com>
- Yannick Vaucher <yannick.vaucher@camptocamp.com> - Yannick Vaucher <yannick.vaucher@camptocamp.com>
- Simone Orsi <simone.orsi@abstract.com> - Simone Orsi <simone.orsi@abstract.com>
- Leonardo Pistone <leonardo.pistone@camptocamp.com> - Leonardo Pistone <leonardo.pistone@camptocamp.com>
- Damien Crier <damien.crier@camptocamp.com> - Damien Crier <damien.crier@camptocamp.com>
- Andrea Stirpe <a.stirpe@onestein.nl> - Andrea Stirpe <a.stirpe@onestein.nl>
- Thomas Rehn <thomas.rehn@initos.com> - Thomas Rehn <thomas.rehn@initos.com>
- Andrea Gallina <4everamd@gmail.com> - Andrea Gallina <4everamd@gmail.com>
- Robert Rottermann <robert@redcor.ch> - Robert Rottermann <robert@redcor.ch>
- Ciro Urselli <c.urselli@apuliasoftware.it> - Ciro Urselli <c.urselli@apuliasoftware.it>
- Francesco Apruzzese <opencode@e-ware.org> - Francesco Apruzzese <opencode@e-ware.org>
- Lorenzo Battistini <https://github.com/eLBati> - Lorenzo Battistini <https://github.com/eLBati>
- Julien Coux <julien.coux@camptocamp.com> - Julien Coux <julien.coux@camptocamp.com>
- Akim Juillerat <akim.juillerat@camptocamp.com> - Akim Juillerat <akim.juillerat@camptocamp.com>
- Alexis de Lattre <alexis@via.ecp.fr> - Alexis de Lattre <alexis@via.ecp.fr>
- Mihai Fekete <feketemihai@gmail.com> - Mihai Fekete <feketemihai@gmail.com>
- Miquel Ra??ch <miquel.raich@forgeflow.com> - Miquel Ra??ch <miquel.raich@forgeflow.com>
- Joan Sisquella <joan.sisquella@forgeflow.com> - Joan Sisquella <joan.sisquella@forgeflow.com>
- `Tecnativa <https://www.tecnativa.com>`__: - `Tecnativa <https://www.tecnativa.com>`__:
- Pedro M. Baeza - Pedro M. Baeza
- Sergio Teruel - Sergio Teruel
- Ernesto Tejeda - Ernesto Tejeda
- Jo??o Marques - Jo??o Marques
- Alexandre D. D??az - Alexandre D. D??az
- V??ctor Mart??nez - V??ctor Mart??nez
- Carolina Fernandez - Carolina Fernandez
- `Sygel <https://www.sygel.es>`__: - `Sygel <https://www.sygel.es>`__:
- Harald Panten - Harald Panten
- Valentin Vinagre - Valentin Vinagre
- Lois Rilo <lois.rilo@forgeflow.com> - Lois Rilo <lois.rilo@forgeflow.com>
- Saran Lim. <saranl@ecosoft.co.th> - Saran Lim. <saranl@ecosoft.co.th>
- Omar Casti??eira <omar@comunitea.com> - Omar Casti??eira <omar@comunitea.com>
Much of the work in this module was done at a sprint in Sorrento, Italy Much of the work in this module was done at a sprint in Sorrento, Italy
in April 2016. in April 2016.
@@ -197,6 +197,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and mission is to support the collaborative development of Odoo features and
promote its widespread use. promote its widespread use.
This module is part of the `OCA/account-financial-reporting <https://github.com/OCA/account-financial-reporting/tree/17.0/account_financial_report>`_ project on GitHub. This module is part of the `OCA/account-financial-reporting <https://github.com/OCA/account-financial-reporting/tree/18.0/account_financial_report>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

4
account_financial_report/models/account_group.py
View File

@@ -42,8 +42,8 @@ class AccountGroup(models.Model):
"""Forms complete code of location from parent location to child location.""" """Forms complete code of location from parent location to child location."""
for group in self: for group in self:
if group.parent_id.complete_code: if group.parent_id.complete_code:
group.complete_code = "{}/{}".format( group.complete_code = (
group.parent_id.complete_code, group.code_prefix_start f"{group.parent_id.complete_code}/{group.code_prefix_start}"
) )
else: else:
group.complete_code = group.code_prefix_start group.complete_code = group.code_prefix_start

4
account_financial_report/report/abstract_report_xlsx.py
View File

@@ -610,8 +610,8 @@ class AbstractReportXslx(models.AbstractModel):
def _get_report_complete_name(self, report, prefix, data=None): def _get_report_complete_name(self, report, prefix, data=None):
if report.company_id: if report.company_id:
suffix = " - {} - {}".format( suffix = (
report.company_id.name, report.company_id.currency_id.name f" - {report.company_id.name} - {report.company_id.currency_id.name}"
) )
return prefix + suffix return prefix + suffix
return prefix return prefix

6
account_financial_report/report/general_ledger.py
View File

@@ -517,9 +517,9 @@ class GeneralLedgerReport(models.AbstractModel):
"balance" "balance"
] ]
if foreign_currency: if foreign_currency:
gen_ld_data[acc_id][item_id]["fin_bal"][ gen_ld_data[acc_id][item_id]["fin_bal"]["bal_curr"] += (
"bal_curr" move_line["amount_currency"]
] += move_line["amount_currency"] )
else: else:
gen_ld_data[acc_id][ml_id] = self._get_move_line_data(move_line) gen_ld_data[acc_id][ml_id] = self._get_move_line_data(move_line)
gen_ld_data[acc_id]["fin_bal"]["credit"] += move_line["credit"] gen_ld_data[acc_id]["fin_bal"]["credit"] += move_line["credit"]

14
account_financial_report/report/journal_ledger.py
View File

@@ -93,9 +93,9 @@ class JournalLedgerReport(models.AbstractModel):
return "move_id" return "move_id"
def _get_move_lines_data(self, ml, wizard, ml_taxes, auto_sequence, exigible): def _get_move_lines_data(self, ml, wizard, ml_taxes, auto_sequence, exigible):
base_debit = ( base_debit = base_credit = tax_debit = tax_credit = base_balance = (
base_credit tax_balance
) = tax_debit = tax_credit = base_balance = tax_balance = 0.0 ) = 0.0
if exigible: if exigible:
base_debit = ml_taxes and ml.debit or 0.0 base_debit = ml_taxes and ml.debit or 0.0
base_credit = ml_taxes and ml.credit or 0.0 base_credit = ml_taxes and ml.credit or 0.0
@@ -312,11 +312,9 @@ class JournalLedgerReport(models.AbstractModel):
if key not in journal_moves_data.keys(): if key not in journal_moves_data.keys():
journal_moves_data[key] = [] journal_moves_data[key] = []
journal_moves_data[key] += list(items) journal_moves_data[key] += list(items)
move_lines_data = ( move_lines_data = account_ids_data = partner_ids_data = currency_ids_data = (
account_ids_data tax_line_ids_data
) = ( ) = move_line_ids_taxes_data = {}
partner_ids_data
) = currency_ids_data = tax_line_ids_data = move_line_ids_taxes_data = {}
if move_ids: if move_ids:
move_lines = self._get_move_lines(move_ids, wizard, journal_ids) move_lines = self._get_move_lines(move_ids, wizard, journal_ids)
move_lines_data = move_lines[1] move_lines_data = move_lines[1]

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

@@ -130,7 +130,9 @@
</t> </t>
<!--## dynamic columns--> <!--## dynamic columns-->
<t t-foreach="age_partner_config.line_ids" t-as="column_dynamic"> <t t-foreach="age_partner_config.line_ids" t-as="column_dynamic">
<div class="act_as_cell"><span t-out="column_dynamic.name" /></div> <div class="act_as_cell">
<span t-out="column_dynamic.name" />
</div>
</t> </t>
</div> </div>
</div> </div>
@@ -149,9 +151,9 @@
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/> />
</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': res_company.currency_id}"
/> />
@@ -357,26 +359,26 @@
/> />
</span> </span>
</div> </div>
<!--## current--> <!--## current-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t t-if="line['current'] == 0"> <t t-if="line['current'] == 0">
<span <span
t-esc="line['current']" t-esc="line['current']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/> />
</t> </t>
<t t-else=""> <t t-else="">
<span <span
domain="[('id', 'in', (line['line_rec'] | line['line_rec'].matched_debit_ids.mapped('debit_move_id') | line['line_rec'].matched_credit_ids.mapped('credit_move_id')).ids)]" domain="[('id', 'in', (line['line_rec'] | line['line_rec'].matched_debit_ids.mapped('debit_move_id') | line['line_rec'].matched_credit_ids.mapped('credit_move_id')).ids)]"
res-model="account.move.line" res-model="account.move.line"
> >
<t <t
t-out="line['current']" t-out="line['current']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/> />
</span> </span>
</t> </t>
</div> </div>
<t t-if="not age_partner_config"> <t t-if="not age_partner_config">
<!--## age_30_days--> <!--## age_30_days-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
@@ -522,13 +524,13 @@
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/> />
</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': res_company.currency_id}"
/> />
</div> </div>
<t t-if="not age_partner_config"> <t t-if="not age_partner_config">
<!--## 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%;">
@@ -591,13 +593,13 @@
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/> />
</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': res_company.currency_id}"
/> />
</div> </div>
<t t-if="not age_partner_config"> <t t-if="not age_partner_config">
<!--## 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%;">
@@ -656,13 +658,13 @@
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/> />
</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': res_company.currency_id}"
/> />
</div> </div>
<t t-if="not age_partner_config"> <t t-if="not age_partner_config">
<!--## 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%">
@@ -802,7 +804,7 @@
% %
</div> </div>
</t> </t>
</t> </t>
</div> </div>
</div> </div>
</template> </template>

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

@@ -492,8 +492,8 @@
t-if="int(line['analytic_distribution'][analytic_id]) &lt; 100" t-if="int(line['analytic_distribution'][analytic_id]) &lt; 100"
> >
<t <t
t-out="int(line['analytic_distribution'][analytic_id])" t-out="int(line['analytic_distribution'][analytic_id])"
/>% />%
</t> </t>
</span> </span>
</div> </div>

126
account_financial_report/report/templates/journal_ledger.xml
View File

@@ -105,7 +105,7 @@
</t> </t>
</t> </t>
<t t-else=""> <t t-else="">
<t t-if="not with_auto_sequence"> <t t-if="not with_auto_sequence">
<t t-set="account_column_style"> <t t-set="account_column_style">
width: 23.78%; width: 23.78%;
</t> </t>
@@ -198,12 +198,8 @@
</b> </b>
</div> </div>
<t t-if="display_currency"> <t t-if="display_currency">
<div class="act_as_cell" name="currency_name"> <div class="act_as_cell" name="currency_name" />
<div class="act_as_cell amount" name="amount_currency" />
</div>
<div class="act_as_cell amount" name="amount_currency">
</div>
</t> </t>
</div> </div>
<div style="width: 100%" /> <div style="width: 100%" />
@@ -256,8 +252,8 @@
<span t-if="display_account_name"> <span t-if="display_account_name">
- -
<span <span
t-esc="o._get_atr_from_dict(move_line['account_id'], account_ids_data, 'name')" t-esc="o._get_atr_from_dict(move_line['account_id'], account_ids_data, 'name')"
/> />
</span> </span>
</div> </div>
<div class="act_as_cell left" name="partner"> <div class="act_as_cell left" name="partner">
@@ -443,77 +439,73 @@
<div class="act_as_table data_table" style="width: 100%;"> <div class="act_as_table data_table" style="width: 100%;">
10 10
<div class="act_as_row labels"> <div class="act_as_row labels">
<div <div class="act_as_cell first_column" name="name" style="width: 30.97%;" />
class="act_as_cell first_column" <div class="act_as_cell" name="description" style="width: 13.27%;" />
name="name" <div class="act_as_cell" name="base_debit" style="width: 9.29%;">
style="width: 30.97%;"
/>
<div class="act_as_cell" name="description" style="width: 13.27%;" />
<div class="act_as_cell" name="base_debit" style="width: 9.29%;">
Debit Debit
</div> </div>
<div class="act_as_cell" name="base_credit" style="width: 9.29%;"> <div class="act_as_cell" name="base_credit" style="width: 9.29%;">
Credit Credit
</div> </div>
<div class="act_as_cell" name="base_balance" style="width: 9.29%;"> <div class="act_as_cell" name="base_balance" style="width: 9.29%;">
Balance Balance
</div> </div>
<div class="act_as_cell" name="tax_debit" style="width: 9.29%;"> <div class="act_as_cell" name="tax_debit" style="width: 9.29%;">
Debit Debit
</div> </div>
<div class="act_as_cell" name="tax_credit" style="width: 9.29%;"> <div class="act_as_cell" name="tax_credit" style="width: 9.29%;">
Credit Credit
</div> </div>
<div class="act_as_cell" name="tax_balance" style="width: 9.29%;"> <div class="act_as_cell" name="tax_balance" style="width: 9.29%;">
Balance Balance
</div> </div>
</div>
<t t-foreach="ReportTaxLines" t-as="tax_line">
<div class="act_as_row lines">
<div class="act_as_cell left" name="tax_name">
<span t-esc="tax_line['tax_name']" />
</div>
<div class="act_as_cell left" name="tax_code">
<span t-esc="tax_line['tax_code']" />
</div>
<div class="act_as_cell amount" name="base_debit">
<span
t-esc="tax_line['base_debit']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
<div class="act_as_cell amount" name="base_credit">
<span
t-esc="tax_line['base_credit']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
<div class="act_as_cell amount" name="base_balance">
<span
t-esc="tax_line['base_balance']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
<div class="act_as_cell amount" name="tax_debit">
<span
t-esc="tax_line['tax_debit']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
<div class="act_as_cell amount" name="tax_credit">
<span
t-esc="tax_line['tax_credit']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
<div class="act_as_cell amount" name="tax_balance">
<span
t-esc="tax_line['tax_balance']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
</div> </div>
<t t-foreach="ReportTaxLines" t-as="tax_line"> </t>
<div class="act_as_row lines">
<div class="act_as_cell left" name="tax_name">
<span t-esc="tax_line['tax_name']" />
</div>
<div class="act_as_cell left" name="tax_code">
<span t-esc="tax_line['tax_code']" />
</div>
<div class="act_as_cell amount" name="base_debit">
<span
t-esc="tax_line['base_debit']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
<div class="act_as_cell amount" name="base_credit">
<span
t-esc="tax_line['base_credit']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
<div class="act_as_cell amount" name="base_balance">
<span
t-esc="tax_line['base_balance']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
<div class="act_as_cell amount" name="tax_debit">
<span
t-esc="tax_line['tax_debit']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
<div class="act_as_cell amount" name="tax_credit">
<span
t-esc="tax_line['tax_credit']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
<div class="act_as_cell amount" name="tax_balance">
<span
t-esc="tax_line['tax_balance']"
t-options="{'widget': 'float', 'precision': 2}"
/>
</div>
</div>
</t>
</div> </div>
</template> </template>
</odoo> </odoo>

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

@@ -98,9 +98,7 @@
<t t-set="style" t-value="'font-size:12px;'" /> <t t-set="style" t-value="'font-size:12px;'" />
<!-- Different style for account group --> <!-- Different style for account group -->
<t t-if="show_hierarchy"> <t t-if="show_hierarchy">
<t <t t-if="balance['type'] == 'group_type'">
t-if="balance['type'] == 'group_type'"
>
<t <t
t-set="style" t-set="style"
t-value="style + 'font-weight: bold; color: blue;'" t-value="style + 'font-weight: bold; color: blue;'"
@@ -143,8 +141,8 @@
view-type="form" view-type="form"
> >
<t <t
t-out="accounts_data[account_id]['code']" t-out="accounts_data[account_id]['code']"
/> - <t t-out="accounts_data[account_id]['name']" /> /> - <t t-out="accounts_data[account_id]['name']" />
</span> </span>
</div> </div>
<div class="act_as_table data_table" style="width: 100%;"> <div class="act_as_table data_table" style="width: 100%;">

42
account_financial_report/report/trial_balance.py
View File

@@ -266,9 +266,9 @@ class TrialBalanceReport(models.AbstractModel):
tb2 = tb["group_by_data"][gb_key] tb2 = tb["group_by_data"][gb_key]
if "group_by_data" in total_amount[acc_id]: if "group_by_data" in total_amount[acc_id]:
if gb_key not in total_amount[acc_id]["group_by_data"]: if gb_key not in total_amount[acc_id]["group_by_data"]:
total_amount[acc_id]["group_by_data"][ total_amount[acc_id]["group_by_data"][gb_key] = (
gb_key self._prepare_total_amount(tb2, foreign_currency)
] = self._prepare_total_amount(tb2, foreign_currency) )
else: else:
total_amount[acc_id]["group_by_data"][gb_key][ total_amount[acc_id]["group_by_data"][gb_key][
"initial_balance" "initial_balance"
@@ -598,19 +598,19 @@ class TrialBalanceReport(models.AbstractModel):
total_amount[unaffected_id]["ending_balance"] += pl_initial_balance total_amount[unaffected_id]["ending_balance"] += pl_initial_balance
total_amount[unaffected_id]["initial_balance"] += pl_initial_balance total_amount[unaffected_id]["initial_balance"] += pl_initial_balance
if foreign_currency: if foreign_currency:
total_amount[unaffected_id][ total_amount[unaffected_id]["ending_currency_balance"] += (
"ending_currency_balance" pl_initial_currency_balance
] += pl_initial_currency_balance )
total_amount[unaffected_id][ total_amount[unaffected_id]["initial_currency_balance"] += (
"initial_currency_balance" pl_initial_currency_balance
] += pl_initial_currency_balance )
if grouped_by: if grouped_by:
total_amount[unaffected_id]["group_by_data"][0][ total_amount[unaffected_id]["group_by_data"][0]["ending_balance"] = (
"ending_balance" total_amount[unaffected_id]["ending_balance"]
] = total_amount[unaffected_id]["ending_balance"] )
total_amount[unaffected_id]["group_by_data"][0][ total_amount[unaffected_id]["group_by_data"][0]["initial_balance"] = (
"initial_balance" total_amount[unaffected_id]["initial_balance"]
] = total_amount[unaffected_id]["initial_balance"] )
if foreign_currency: if foreign_currency:
total_amount[unaffected_id]["group_by_data"][0][ total_amount[unaffected_id]["group_by_data"][0][
"ending_currency_balance" "ending_currency_balance"
@@ -833,12 +833,12 @@ class TrialBalanceReport(models.AbstractModel):
"ending_balance" "ending_balance"
] ]
if foreign_currency: if foreign_currency:
groups_data[group_id][ groups_data[group_id]["initial_currency_balance"] += (
"initial_currency_balance" total_amount[acc_id]["initial_currency_balance"]
] += total_amount[acc_id]["initial_currency_balance"] )
groups_data[group_id][ groups_data[group_id]["ending_currency_balance"] += (
"ending_currency_balance" total_amount[acc_id]["ending_currency_balance"]
] += total_amount[acc_id]["ending_currency_balance"] )
return groups_data return groups_data
def _get_report_values(self, docids, data): def _get_report_values(self, docids, data):

6
account_financial_report/static/description/index.html
View File

@@ -369,7 +369,7 @@ ul.auto-toc {
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:4d56adc35fff26b88020bebb3cd0fcb302b7c7c7483639925cfc4f9b850d8ac4 !! source digest: sha256:4d56adc35fff26b88020bebb3cd0fcb302b7c7c7483639925cfc4f9b850d8ac4
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-financial-reporting/tree/17.0/account_financial_report"><img alt="OCA/account-financial-reporting" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-financial-reporting-17-0/account-financial-reporting-17-0-account_financial_report"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p> <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-financial-reporting/tree/18.0/account_financial_report"><img alt="OCA/account-financial-reporting" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-financial-reporting-18-0/account-financial-reporting-18-0-account_financial_report"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module adds a set of financial reports. They are accessible under <p>This module adds a set of financial reports. They are accessible under
Invoicing / Reporting / OCA accounting reports.</p> Invoicing / Reporting / OCA accounting reports.</p>
<ul class="simple"> <ul class="simple">
@@ -472,7 +472,7 @@ levels</li>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues">GitHub Issues</a>. <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported. In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed If you spotted it first, help us to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20account_financial_report%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> <a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20account_financial_report%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p> <p>Do not contact contributors directly about support or help with technical issues.</p>
</div> </div>
<div class="section" id="credits"> <div class="section" id="credits">
@@ -538,7 +538,7 @@ in April 2016.</p>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and mission is to support the collaborative development of Odoo features and
promote its widespread use.</p> promote its widespread use.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/17.0/account_financial_report">OCA/account-financial-reporting</a> project on GitHub.</p> <p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/18.0/account_financial_report">OCA/account-financial-reporting</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p> <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div> </div>
</div> </div>

28
account_financial_report/wizard/general_ledger_wizard_view.xml
View File

@@ -105,24 +105,24 @@
<footer> <footer>
<div invisible="not only_one_unaffected_earnings_account"> <div invisible="not only_one_unaffected_earnings_account">
<button <button
name="button_export_html" name="button_export_html"
string="View" string="View"
type="object" type="object"
default_focus="1" default_focus="1"
class="oe_highlight" class="oe_highlight"
/> />
or or
<button <button
name="button_export_pdf" name="button_export_pdf"
string="Export PDF" string="Export PDF"
type="object" type="object"
/> />
or or
<button <button
name="button_export_xlsx" name="button_export_xlsx"
string="Export XLSX" string="Export XLSX"
type="object" type="object"
/> />
or or
<button string="Cancel" class="oe_link" special="cancel" /> <button string="Cancel" class="oe_link" special="cancel" />
</div> </div>

28
account_financial_report/wizard/journal_ledger_wizard_view.xml
View File

@@ -41,24 +41,24 @@
</group> </group>
<footer> <footer>
<button <button
name="button_export_html" name="button_export_html"
string="View" string="View"
type="object" type="object"
default_focus="1" default_focus="1"
class="oe_highlight" class="oe_highlight"
/> />
or or
<button <button
name="button_export_pdf" name="button_export_pdf"
string="Export PDF" string="Export PDF"
type="object" type="object"
/> />
or or
<button <button
name="button_export_xlsx" name="button_export_xlsx"
string="Export XLSX" string="Export XLSX"
type="object" type="object"
/> />
or or
<button string="Cancel" class="oe_link" special="cancel" /> <button string="Cancel" class="oe_link" special="cancel" />
</footer> </footer>

28
account_financial_report/wizard/open_items_wizard_view.xml
View File

@@ -63,24 +63,24 @@
</group> </group>
<footer> <footer>
<button <button
name="button_export_html" name="button_export_html"
string="View" string="View"
type="object" type="object"
default_focus="1" default_focus="1"
class="oe_highlight" class="oe_highlight"
/> />
or or
<button <button
name="button_export_pdf" name="button_export_pdf"
string="Export PDF" string="Export PDF"
type="object" type="object"
/> />
or or
<button <button
name="button_export_xlsx" name="button_export_xlsx"
string="Export XLSX" string="Export XLSX"
type="object" type="object"
/> />
or or
<button string="Cancel" class="oe_link" special="cancel" /> <button string="Cancel" class="oe_link" special="cancel" />
</footer> </footer>

28
account_financial_report/wizard/trial_balance_wizard_view.xml
View File

@@ -120,24 +120,24 @@
<footer> <footer>
<div invisible="not only_one_unaffected_earnings_account"> <div invisible="not only_one_unaffected_earnings_account">
<button <button
name="button_export_html" name="button_export_html"
string="View" string="View"
type="object" type="object"
default_focus="1" default_focus="1"
class="oe_highlight" class="oe_highlight"
/> />
or or
<button <button
name="button_export_pdf" name="button_export_pdf"
string="Export PDF" string="Export PDF"
type="object" type="object"
/> />
or or
<button <button
name="button_export_xlsx" name="button_export_xlsx"
string="Export XLSX" string="Export XLSX"
type="object" type="object"
/> />
or or
<button string="Cancel" class="oe_link" special="cancel" /> <button string="Cancel" class="oe_link" special="cancel" />
</div> </div>

28
account_financial_report/wizard/vat_report_wizard_view.xml
View File

@@ -26,24 +26,24 @@
</group> </group>
<footer> <footer>
<button <button
name="button_export_html" name="button_export_html"
string="View" string="View"
type="object" type="object"
default_focus="1" default_focus="1"
class="oe_highlight" class="oe_highlight"
/> />
or or
<button <button
name="button_export_pdf" name="button_export_pdf"
string="Export PDF" string="Export PDF"
type="object" type="object"
/> />
or or
<button <button
name="button_export_xlsx" name="button_export_xlsx"
string="Export XLSX" string="Export XLSX"
type="object" type="object"
/> />
or or
<button string="Cancel" class="oe_link" special="cancel" /> <button string="Cancel" class="oe_link" special="cancel" />
</footer> </footer>