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:
Henrik Norlin
2024-01-24 12:12:00 +01:00
committed by chaule97
parent f202a3396a
commit 0b128f03ee
21 changed files with 171 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
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/16.0/account_financial_report :target: https://github.com/OCA/account-financial-reporting/tree/17.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-16-0/account-financial-reporting-16-0-account_financial_report :target: https://translation.odoo-community.org/projects/account-financial-reporting-17-0/account-financial-reporting-17-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=16.0 :target: https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=17.0
:alt: Try me on Runboat :alt: Try me on Runboat
|badge1| |badge2| |badge3| |badge4| |badge5| |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -31,19 +31,20 @@ 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 compatible with a foreign Currently General ledger, Trial Balance and Open Items are fully
currency set up in account in order to display balances. Moreover, any foreign compatible with a foreign currency set up in account in order to display
currency used in account move lines is properly shown. balances. Moreover, any foreign currency used in account move lines is
properly shown.
In case that in an account has not been configured a second currency foreign In case that in an account has not been configured a second currency
currency balances are not available. foreign currency balances are not available.
**Table of contents** **Table of contents**
@@ -53,36 +54,35 @@ currency balances are not available.
Known issues / Roadmap Known issues / Roadmap
====================== ======================
* 'VAT Report' is valid only for cases where it's met that for each - 'VAT Report' is valid only for cases where it's met that for each Tax
Tax defined: all the "Account tags" of all the defined: all the "Account tags" of all the 'Repartition for Invoices'
'Repartition for Invoices' or 'Repartition for Credit Notes' or 'Repartition for Credit Notes' are different.
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 the entries when the option "All Entries" is selected in "Target
state of the entries when the option "All Entries" is selected Moves" field in a wizard
in "Target Moves" field in a wizard
Changelog 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 levels - In the Trial Balance you have an option to hide parent hierarchy
levels
11.0.2.4.1 (2019-01-08) 11.0.2.4.1 (2019-01-08)
~~~~~~~~~~~~~~~~~~~~~~~ -----------------------
* Handle better multicompany behaviour
* Improve how title appears in the reports
* Improve performance in General Ledger
- Handle better multicompany behaviour
- Improve how title appears in the reports
- 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
=========== ===========
@@ -90,7 +90,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:%2016.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:%2017.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.
@@ -98,7 +98,7 @@ Credits
======= =======
Authors Authors
~~~~~~~ -------
* Camptocamp SA * Camptocamp SA
* initOS GmbH * initOS GmbH
@@ -106,49 +106,49 @@ Authors
* ForgeFlow * ForgeFlow
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
* `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 in Much of the work in this module was done at a sprint in Sorrento, Italy
April 2016. in April 2016.
Maintainers Maintainers
~~~~~~~~~~~ -----------
This module is maintained by the OCA. This module is maintained by the OCA.
@@ -160,6 +160,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/16.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/17.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

@@ -33,9 +33,7 @@ class AccountGroup(models.Model):
"""Forms complete name of location from parent location to child location.""" """Forms complete name of location from parent location to child location."""
for group in self: for group in self:
if group.parent_id.complete_name: if group.parent_id.complete_name:
group.complete_name = "{}/{}".format( group.complete_name = f"{group.parent_id.complete_name}/{group.name}"
group.parent_id.complete_name, group.name
)
else: else:
group.complete_name = group.name group.complete_name = group.name

3
account_financial_report/pyproject.toml Normal file
View File

@@ -0,0 +1,3 @@
[build-system]
requires = ["whool"]
build-backend = "whool.buildapi"

34
account_financial_report/readme/CONTRIBUTORS.md Normal file
View File

@@ -0,0 +1,34 @@
- Jordi Ballester \<<jordi.ballester@forgeflow.com>\>
- Yannick Vaucher \<<yannick.vaucher@camptocamp.com>\>
- Simone Orsi \<<simone.orsi@abstract.com>\>
- Leonardo Pistone \<<leonardo.pistone@camptocamp.com>\>
- Damien Crier \<<damien.crier@camptocamp.com>\>
- Andrea Stirpe \<<a.stirpe@onestein.nl>\>
- Thomas Rehn \<<thomas.rehn@initos.com>\>
- Andrea Gallina \<<4everamd@gmail.com>\>
- Robert Rottermann \<<robert@redcor.ch>\>
- Ciro Urselli \<<c.urselli@apuliasoftware.it>\>
- Francesco Apruzzese \<<opencode@e-ware.org>\>
- Lorenzo Battistini \<<https://github.com/eLBati>\>
- Julien Coux \<<julien.coux@camptocamp.com>\>
- Akim Juillerat \<<akim.juillerat@camptocamp.com>\>
- Alexis de Lattre \<<alexis@via.ecp.fr>\>
- Mihai Fekete \<<feketemihai@gmail.com>\>
- Miquel Ra??ch \<<miquel.raich@forgeflow.com>\>
- Joan Sisquella \<<joan.sisquella@forgeflow.com>\>
- [Tecnativa](https://www.tecnativa.com):
- Pedro M. Baeza
- Sergio Teruel
- Ernesto Tejeda
- Jo??o Marques
- Alexandre D. D??az
- V??ctor Mart??nez
- [Sygel](https://www.sygel.es):
- Harald Panten
- Valentin Vinagre
- Lois Rilo \<<lois.rilo@forgeflow.com>\>
- Saran Lim. \<<saranl@ecosoft.co.th>\>
- Omar Casti??eira \<<omar@comunitea.com>\>
Much of the work in this module was done at a sprint in Sorrento, Italy
in April 2016.

38
account_financial_report/readme/CONTRIBUTORS.rst
View File

@@ -1,38 +0,0 @@
* Jordi Ballester <jordi.ballester@forgeflow.com>
* Yannick Vaucher <yannick.vaucher@camptocamp.com>
* Simone Orsi <simone.orsi@abstract.com>
* Leonardo Pistone <leonardo.pistone@camptocamp.com>
* Damien Crier <damien.crier@camptocamp.com>
* Andrea Stirpe <a.stirpe@onestein.nl>
* Thomas Rehn <thomas.rehn@initos.com>
* Andrea Gallina <4everamd@gmail.com>
* Robert Rottermann <robert@redcor.ch>
* Ciro Urselli <c.urselli@apuliasoftware.it>
* Francesco Apruzzese <opencode@e-ware.org>
* Lorenzo Battistini <https://github.com/eLBati>
* Julien Coux <julien.coux@camptocamp.com>
* Akim Juillerat <akim.juillerat@camptocamp.com>
* Alexis de Lattre <alexis@via.ecp.fr>
* Mihai Fekete <feketemihai@gmail.com>
* Miquel Ra??ch <miquel.raich@forgeflow.com>
* Joan Sisquella <joan.sisquella@forgeflow.com>
* `Tecnativa <https://www.tecnativa.com>`__:
* Pedro M. Baeza
* Sergio Teruel
* Ernesto Tejeda
* Jo??o Marques
* Alexandre D. D??az
* V??ctor Mart??nez
* `Sygel <https://www.sygel.es>`__:
* Harald Panten
* Valentin Vinagre
* Lois Rilo <lois.rilo@forgeflow.com>
* Saran Lim. <saranl@ecosoft.co.th>
* Omar Casti??eira <omar@comunitea.com>
Much of the work in this module was done at a sprint in Sorrento, Italy in
April 2016.

11
account_financial_report/readme/DESCRIPTION.rst → account_financial_report/readme/DESCRIPTION.md
View File

@@ -8,9 +8,10 @@ Invoicing / Reporting / OCA accounting reports.
- VAT Report - VAT Report
- Journal Ledger - Journal Ledger
Currently General ledger, Trial Balance and Open Items are fully compatible with a foreign Currently General ledger, Trial Balance and Open Items are fully
currency set up in account in order to display balances. Moreover, any foreign compatible with a foreign currency set up in account in order to display
currency used in account move lines is properly shown. balances. Moreover, any foreign currency used in account move lines is
properly shown.
In case that in an account has not been configured a second currency foreign In case that in an account has not been configured a second currency
currency balances are not available. foreign currency balances are not available.

16
account_financial_report/readme/HISTORY.md Normal file
View File

@@ -0,0 +1,16 @@
## 11.0.2.5.0 (2019-04-26)
- In the Trial Balance you have an option to hide parent hierarchy
levels
## 11.0.2.4.1 (2019-01-08)
- Handle better multicompany behaviour
- Improve how title appears in the reports
- Improve performance in General Ledger
## 11.0.2.3.1 (2018-11-29)
- 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 Journal Ledger the field 'Journal' is now optional

19
account_financial_report/readme/HISTORY.rst
View File

@@ -1,19 +0,0 @@
11.0.2.5.0 (2019-04-26)
~~~~~~~~~~~~~~~~~~~~~~~
* In the Trial Balance you have an option to hide parent hierarchy levels
11.0.2.4.1 (2019-01-08)
~~~~~~~~~~~~~~~~~~~~~~~
* Handle better multicompany behaviour
* Improve how title appears in the reports
* Improve performance in General Ledger
11.0.2.3.1 (2018-11-29)
~~~~~~~~~~~~~~~~~~~~~~~
* 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 Journal Ledger the field 'Journal' is now optional

6
account_financial_report/readme/ROADMAP.md Normal file
View File

@@ -0,0 +1,6 @@
- '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'
or 'Repartition for Credit Notes' are different.
- 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
Moves" field in a wizard

7
account_financial_report/readme/ROADMAP.rst
View File

@@ -1,7 +0,0 @@
* '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' or 'Repartition for Credit Notes'
are different.
* 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 Moves" field in a wizard

4
account_financial_report/report/abstract_report_xlsx.py
View File

@@ -536,7 +536,7 @@ class AbstractReportXslx(models.AbstractModel):
currency = self.env["res.currency"].browse(line_object["currency_id"]) currency = self.env["res.currency"].browse(line_object["currency_id"])
else: else:
currency = line_object["currency_id"] currency = line_object["currency_id"]
field_name = "{}_{}".format(field_prefix, currency.name) field_name = f"{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)
else: else:
@@ -558,7 +558,7 @@ class AbstractReportXslx(models.AbstractModel):
currency = self.env["res.currency"].browse(line_dict["currency_id"]) currency = self.env["res.currency"].browse(line_dict["currency_id"])
else: else:
currency = line_dict["currency_id"] currency = line_dict["currency_id"]
field_name = "{}_{}".format(field_prefix, currency.name) field_name = f"{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)
else: else:

2
account_financial_report/report/aged_partner_balance.py
View File

@@ -196,7 +196,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
elif not move_line["name"]: elif not move_line["name"]:
ref_label = move_line["ref"] ref_label = move_line["ref"]
else: else:
ref_label = move_line["ref"] + str(" - ") + move_line["name"] ref_label = move_line["ref"] + " - " + move_line["name"]
move_line_data.update( move_line_data.update(
{ {
"line_rec": line_model.browse(move_line["id"]), "line_rec": line_model.browse(move_line["id"]),

2
account_financial_report/report/aged_partner_balance_xlsx.py
View File

@@ -16,7 +16,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
report_name = _("Aged Partner Balance") report_name = _("Aged Partner Balance")
if company_id: if company_id:
company = self.env["res.company"].browse(company_id) company = self.env["res.company"].browse(company_id)
suffix = " - {} - {}".format(company.name, company.currency_id.name) suffix = f" - {company.name} - {company.currency_id.name}"
report_name = report_name + suffix report_name = report_name + suffix
return report_name return report_name

2
account_financial_report/report/general_ledger.py
View File

@@ -347,7 +347,7 @@ class GeneralLedgerReport(models.AbstractModel):
elif move_line_data["name"] == "": elif move_line_data["name"] == "":
ref_label = move_line_data["ref"] ref_label = move_line_data["ref"]
else: else:
ref_label = move_line_data["ref"] + str(" - ") + move_line_data["name"] ref_label = move_line_data["ref"] + " - " + move_line_data["name"]
move_line_data.update({"ref_label": ref_label}) move_line_data.update({"ref_label": ref_label})
return move_line_data return move_line_data

2
account_financial_report/report/general_ledger_xlsx.py
View File

@@ -18,7 +18,7 @@ class GeneralLedgerXslx(models.AbstractModel):
report_name = _("General Ledger") report_name = _("General Ledger")
if company_id: if company_id:
company = self.env["res.company"].browse(company_id) company = self.env["res.company"].browse(company_id)
suffix = " - {} - {}".format(company.name, company.currency_id.name) suffix = f" - {company.name} - {company.currency_id.name}"
report_name = report_name + suffix report_name = report_name + suffix
return report_name return report_name

10
account_financial_report/report/journal_ledger_xlsx.py
View File

@@ -17,7 +17,7 @@ class JournalLedgerXslx(models.AbstractModel):
report_name = _("Journal Ledger") report_name = _("Journal Ledger")
if company_id: if company_id:
company = self.env["res.company"].browse(company_id) company = self.env["res.company"].browse(company_id)
suffix = " - {} - {}".format(company.name, company.currency_id.name) suffix = f" - {company.name} - {company.currency_id.name}"
report_name = report_name + suffix report_name = report_name + suffix
return report_name return report_name
@@ -149,7 +149,7 @@ class JournalLedgerXslx(models.AbstractModel):
_("Journals"), _("Journals"),
", ".join( ", ".join(
[ [
"{} - {}".format(report_journal.code, report_journal.name) f"{report_journal.code} - {report_journal.name}"
for report_journal in report.journal_ids for report_journal in report.journal_ids
] ]
), ),
@@ -184,7 +184,7 @@ class JournalLedgerXslx(models.AbstractModel):
and journal.currency_id.name and journal.currency_id.name
or journal.company_id.currency_id.name or journal.company_id.currency_id.name
) )
sheet_name = "{} ({}) - {}".format(journal.code, currency_name, journal.name) sheet_name = f"{journal.code} ({currency_name}) - {journal.name}"
self._generate_moves_content( self._generate_moves_content(
workbook, sheet_name, report, res_data, ledger["report_moves"], report_data workbook, sheet_name, report, res_data, ledger["report_moves"], report_data
) )
@@ -202,9 +202,7 @@ class JournalLedgerXslx(models.AbstractModel):
and journal.currency_id.name and journal.currency_id.name
or journal.company_id.currency_id.name or journal.company_id.currency_id.name
) )
sheet_name = "Tax - {} ({}) - {}".format( sheet_name = f"Tax - {journal.code} ({currency_name}) - {journal.name}"
journal.code, currency_name, journal.name
)
self._generate_taxes_summary( self._generate_taxes_summary(
workbook, sheet_name, ledger["tax_lines"], report_data workbook, sheet_name, ledger["tax_lines"], report_data
) )

2
account_financial_report/report/open_items.py
View File

@@ -147,7 +147,7 @@ class OpenItemsReport(models.AbstractModel):
elif not move_line["name"]: elif not move_line["name"]:
ref_label = move_line["ref"] ref_label = move_line["ref"]
else: else:
ref_label = move_line["ref"] + str(" - ") + move_line["name"] ref_label = move_line["ref"] + " - " + move_line["name"]
move_line.update( move_line.update(
{ {

2
account_financial_report/report/open_items_xlsx.py
View File

@@ -16,7 +16,7 @@ class OpenItemsXslx(models.AbstractModel):
report_name = _("Open Items") report_name = _("Open Items")
if company_id: if company_id:
company = self.env["res.company"].browse(company_id) company = self.env["res.company"].browse(company_id)
suffix = " - {} - {}".format(company.name, company.currency_id.name) suffix = f" - {company.name} - {company.currency_id.name}"
report_name = report_name + suffix report_name = report_name + suffix
return report_name return report_name

2
account_financial_report/report/trial_balance_xlsx.py
View File

@@ -17,7 +17,7 @@ class TrialBalanceXslx(models.AbstractModel):
report_name = _("Trial Balance") report_name = _("Trial Balance")
if company_id: if company_id:
company = self.env["res.company"].browse(company_id) company = self.env["res.company"].browse(company_id)
suffix = " - {} - {}".format(company.name, company.currency_id.name) suffix = f" - {company.name} - {company.currency_id.name}"
report_name = report_name + suffix report_name = report_name + suffix
return report_name return report_name

2
account_financial_report/report/vat_report_xlsx.py
View File

@@ -15,7 +15,7 @@ class VATReportXslx(models.AbstractModel):
report_name = _("Vat Report") report_name = _("Vat Report")
if company_id: if company_id:
company = self.env["res.company"].browse(company_id) company = self.env["res.company"].browse(company_id)
suffix = " - {} - {}".format(company.name, company.currency_id.name) suffix = f" - {company.name} - {company.currency_id.name}"
report_name = report_name + suffix report_name = report_name + suffix
return report_name return report_name

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

@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
@@ -368,7 +369,7 @@ ul.auto-toc {
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:4020cb8359451e565e691245229411bac1eb62948b0f199e3cb408a58cbc6dc0 !! source digest: sha256:4020cb8359451e565e691245229411bac1eb62948b0f199e3cb408a58cbc6dc0
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/16.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-16-0/account-financial-reporting-16-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=16.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/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>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">
@@ -379,11 +380,12 @@ Invoicing / Reporting / OCA accounting reports.</p>
<li>VAT Report</li> <li>VAT Report</li>
<li>Journal Ledger</li> <li>Journal Ledger</li>
</ul> </ul>
<p>Currently General ledger, Trial Balance and Open Items are fully compatible with a foreign <p>Currently General ledger, Trial Balance and Open Items are fully
currency set up in account in order to display balances. Moreover, any foreign compatible with a foreign currency set up in account in order to display
currency used in account move lines is properly shown.</p> balances. Moreover, any foreign currency used in account move lines is
<p>In case that in an account has not been configured a second currency foreign properly shown.</p>
currency balances are not available.</p> <p>In case that in an account has not been configured a second currency
foreign currency balances are not available.</p>
<p><strong>Table of contents</strong></p> <p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents"> <div class="contents local topic" id="contents">
<ul class="simple"> <ul class="simple">
@@ -406,13 +408,12 @@ currency balances are not available.</p>
<div class="section" id="known-issues-roadmap"> <div class="section" id="known-issues-roadmap">
<h1><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h1> <h1><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h1>
<ul class="simple"> <ul class="simple">
<li>???VAT Report??? is valid only for cases where it???s met that for each <li>‘VAT Report’ is valid only for cases where it’s met that for each Tax
Tax defined: all the ???Account tags??? of all the defined: all the “Account tags” of all the ‘Repartition for Invoices’
???Repartition for Invoices??? or ???Repartition for Credit Notes??? or ‘Repartition for Credit Notes’ are different.</li>
are different.</li> <li>It would be nice to have in reports a column indicating the state of
<li>It would be nice to have in reports a column indicating the the entries when the option “All Entries” is selected in “Target
state of the entries when the option ???All Entries??? is selected Moves” field in a wizard</li>
in ???Target Moves??? field in a wizard</li>
</ul> </ul>
</div> </div>
<div class="section" id="changelog"> <div class="section" id="changelog">
@@ -420,7 +421,8 @@ in ???Target Moves??? field in a wizard</li>
<div class="section" id="section-1"> <div class="section" id="section-1">
<h2><a class="toc-backref" href="#toc-entry-3">11.0.2.5.0 (2019-04-26)</a></h2> <h2><a class="toc-backref" href="#toc-entry-3">11.0.2.5.0 (2019-04-26)</a></h2>
<ul class="simple"> <ul class="simple">
<li>In the Trial Balance you have an option to hide parent hierarchy levels</li> <li>In the Trial Balance you have an option to hide parent hierarchy
levels</li>
</ul> </ul>
</div> </div>
<div class="section" id="section-2"> <div class="section" id="section-2">
@@ -436,7 +438,7 @@ in ???Target Moves??? field in a wizard</li>
<ul class="simple"> <ul class="simple">
<li>In the Trial Balance you can apply a filter by hierarchy levels</li> <li>In the Trial Balance you can apply a filter by hierarchy levels</li>
<li>In the General Ledger you can apply a filter by Analytic Tag</li> <li>In the General Ledger you can apply a filter by Analytic Tag</li>
<li>In the Journal Ledger the field ???Journal??? is now optional</li> <li>In the Journal Ledger the field ‘Journal’ is now optional</li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -445,7 +447,7 @@ in ???Target Moves??? field in a wizard</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:%2016.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:%2017.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">
@@ -498,8 +500,8 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
<li>Saran Lim. &lt;<a class="reference external" href="mailto:saranl&#64;ecosoft.co.th">saranl&#64;ecosoft.co.th</a>&gt;</li> <li>Saran Lim. &lt;<a class="reference external" href="mailto:saranl&#64;ecosoft.co.th">saranl&#64;ecosoft.co.th</a>&gt;</li>
<li>Omar Casti??eira &lt;<a class="reference external" href="mailto:omar&#64;comunitea.com">omar&#64;comunitea.com</a>&gt;</li> <li>Omar Casti??eira &lt;<a class="reference external" href="mailto:omar&#64;comunitea.com">omar&#64;comunitea.com</a>&gt;</li>
</ul> </ul>
<p>Much of the work in this module was done at a sprint in Sorrento, Italy in <p>Much of the work in this module was done at a sprint in Sorrento, Italy
April 2016.</p> in April 2016.</p>
</div> </div>
<div class="section" id="maintainers"> <div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-10">Maintainers</a></h2> <h2><a class="toc-backref" href="#toc-entry-10">Maintainers</a></h2>
@@ -508,7 +510,7 @@ 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/16.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/17.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>