diff --git a/account_financial_report/README.rst b/account_financial_report/README.rst index 7d0431b4..b7224f9e 100644 --- a/account_financial_report/README.rst +++ b/account_financial_report/README.rst @@ -17,13 +17,13 @@ Account Financial Reports :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |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 .. |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 .. |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 |badge1| |badge2| |badge3| |badge4| |badge5| @@ -31,12 +31,12 @@ Account Financial Reports This module adds a set of financial reports. They are accessible under Invoicing / Reporting / OCA accounting reports. -- General ledger -- Trial Balance -- Open Items -- Aged Partner Balance -- VAT Report -- Journal Ledger +- General ledger +- Trial Balance +- Open Items +- Aged Partner Balance +- VAT Report +- Journal Ledger Currently General ledger, Trial Balance and Open Items are fully compatible with a foreign currency set up in account in order to display @@ -90,12 +90,12 @@ per company in: Known issues / Roadmap ====================== -- '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 +- '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 Changelog ========= @@ -103,22 +103,22 @@ Changelog 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) ----------------------- -- 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) ----------------------- -- 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 +- 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 Bug Tracker =========== @@ -126,7 +126,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. 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 -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -144,42 +144,42 @@ Authors Contributors ------------ -- Jordi Ballester -- Yannick Vaucher -- Simone Orsi -- Leonardo Pistone -- Damien Crier -- Andrea Stirpe -- Thomas Rehn -- Andrea Gallina <4everamd@gmail.com> -- Robert Rottermann -- Ciro Urselli -- Francesco Apruzzese -- Lorenzo Battistini -- Julien Coux -- Akim Juillerat -- Alexis de Lattre -- Mihai Fekete -- Miquel Ra??ch -- Joan Sisquella -- `Tecnativa `__: +- Jordi Ballester +- Yannick Vaucher +- Simone Orsi +- Leonardo Pistone +- Damien Crier +- Andrea Stirpe +- Thomas Rehn +- Andrea Gallina <4everamd@gmail.com> +- Robert Rottermann +- Ciro Urselli +- Francesco Apruzzese +- Lorenzo Battistini +- Julien Coux +- Akim Juillerat +- Alexis de Lattre +- Mihai Fekete +- Miquel Ra??ch +- Joan Sisquella +- `Tecnativa `__: - - Pedro M. Baeza - - Sergio Teruel - - Ernesto Tejeda - - Jo??o Marques - - Alexandre D. D??az - - V??ctor Mart??nez - - Carolina Fernandez + - Pedro M. Baeza + - Sergio Teruel + - Ernesto Tejeda + - Jo??o Marques + - Alexandre D. D??az + - V??ctor Mart??nez + - Carolina Fernandez -- `Sygel `__: +- `Sygel `__: - - Harald Panten - - Valentin Vinagre + - Harald Panten + - Valentin Vinagre -- Lois Rilo -- Saran Lim. -- Omar Casti??eira +- Lois Rilo +- Saran Lim. +- Omar Casti??eira Much of the work in this module was done at a sprint in Sorrento, Italy 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 promote its widespread use. -This module is part of the `OCA/account-financial-reporting `_ project on GitHub. +This module is part of the `OCA/account-financial-reporting `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_financial_report/models/account_group.py b/account_financial_report/models/account_group.py index db414b5e..1f6f2eea 100644 --- a/account_financial_report/models/account_group.py +++ b/account_financial_report/models/account_group.py @@ -42,8 +42,8 @@ class AccountGroup(models.Model): """Forms complete code of location from parent location to child location.""" for group in self: if group.parent_id.complete_code: - group.complete_code = "{}/{}".format( - group.parent_id.complete_code, group.code_prefix_start + group.complete_code = ( + f"{group.parent_id.complete_code}/{group.code_prefix_start}" ) else: group.complete_code = group.code_prefix_start diff --git a/account_financial_report/report/abstract_report_xlsx.py b/account_financial_report/report/abstract_report_xlsx.py index 4d93de63..75c606b0 100644 --- a/account_financial_report/report/abstract_report_xlsx.py +++ b/account_financial_report/report/abstract_report_xlsx.py @@ -610,8 +610,8 @@ class AbstractReportXslx(models.AbstractModel): def _get_report_complete_name(self, report, prefix, data=None): if report.company_id: - suffix = " - {} - {}".format( - report.company_id.name, report.company_id.currency_id.name + suffix = ( + f" - {report.company_id.name} - {report.company_id.currency_id.name}" ) return prefix + suffix return prefix diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py index 4768cf23..520c29f3 100644 --- a/account_financial_report/report/general_ledger.py +++ b/account_financial_report/report/general_ledger.py @@ -517,9 +517,9 @@ class GeneralLedgerReport(models.AbstractModel): "balance" ] if foreign_currency: - gen_ld_data[acc_id][item_id]["fin_bal"][ - "bal_curr" - ] += move_line["amount_currency"] + gen_ld_data[acc_id][item_id]["fin_bal"]["bal_curr"] += ( + move_line["amount_currency"] + ) else: 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"] diff --git a/account_financial_report/report/journal_ledger.py b/account_financial_report/report/journal_ledger.py index 7ee4a9a6..04bbffce 100644 --- a/account_financial_report/report/journal_ledger.py +++ b/account_financial_report/report/journal_ledger.py @@ -93,9 +93,9 @@ class JournalLedgerReport(models.AbstractModel): return "move_id" def _get_move_lines_data(self, ml, wizard, ml_taxes, auto_sequence, exigible): - base_debit = ( - base_credit - ) = tax_debit = tax_credit = base_balance = tax_balance = 0.0 + base_debit = base_credit = tax_debit = tax_credit = base_balance = ( + tax_balance + ) = 0.0 if exigible: base_debit = ml_taxes and ml.debit 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(): journal_moves_data[key] = [] journal_moves_data[key] += list(items) - move_lines_data = ( - account_ids_data - ) = ( - partner_ids_data - ) = currency_ids_data = tax_line_ids_data = move_line_ids_taxes_data = {} + move_lines_data = account_ids_data = partner_ids_data = currency_ids_data = ( + tax_line_ids_data + ) = move_line_ids_taxes_data = {} if move_ids: move_lines = self._get_move_lines(move_ids, wizard, journal_ids) move_lines_data = move_lines[1] diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml index 3c5f827b..4ae8669f 100644 --- a/account_financial_report/report/templates/aged_partner_balance.xml +++ b/account_financial_report/report/templates/aged_partner_balance.xml @@ -130,7 +130,9 @@ -
+
+ +
@@ -149,9 +151,9 @@ t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}" /> - +
- @@ -357,26 +359,26 @@ />
- -
- - +
+ + - - - + + - - - -
+ + +
@@ -522,13 +524,13 @@ t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}" />
- -
- +
+ -
+
@@ -591,13 +593,13 @@ t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}" />
- -
- +
+ -
+
@@ -656,13 +658,13 @@ t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}" />
- -
- +
+ -
+
@@ -802,7 +804,7 @@ %
- + diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml index ac2f1ef6..690010dd 100644 --- a/account_financial_report/report/templates/general_ledger.xml +++ b/account_financial_report/report/templates/general_ledger.xml @@ -492,8 +492,8 @@ t-if="int(line['analytic_distribution'][analytic_id]) < 100" > % + t-out="int(line['analytic_distribution'][analytic_id])" + />% diff --git a/account_financial_report/report/templates/journal_ledger.xml b/account_financial_report/report/templates/journal_ledger.xml index 7df081cc..97d3608d 100644 --- a/account_financial_report/report/templates/journal_ledger.xml +++ b/account_financial_report/report/templates/journal_ledger.xml @@ -105,7 +105,7 @@ - + width: 23.78%; @@ -198,12 +198,8 @@ -
- -
-
- -
+
+
@@ -256,8 +252,8 @@ - + t-esc="o._get_atr_from_dict(move_line['account_id'], account_ids_data, 'name')" + />
@@ -443,77 +439,73 @@
10
-
-
-
+
+
+
Debit
-
+
Credit
-
+
Balance
-
+
Debit
-
+
Credit
-
+
Balance
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- +
diff --git a/account_financial_report/report/templates/trial_balance.xml b/account_financial_report/report/templates/trial_balance.xml index 8a3b3c8d..36f2e87b 100644 --- a/account_financial_report/report/templates/trial_balance.xml +++ b/account_financial_report/report/templates/trial_balance.xml @@ -98,9 +98,7 @@ - + - + t-out="accounts_data[account_id]['code']" + /> -
diff --git a/account_financial_report/report/trial_balance.py b/account_financial_report/report/trial_balance.py index 9c6da348..4f4b6df8 100644 --- a/account_financial_report/report/trial_balance.py +++ b/account_financial_report/report/trial_balance.py @@ -266,9 +266,9 @@ class TrialBalanceReport(models.AbstractModel): tb2 = tb["group_by_data"][gb_key] if "group_by_data" in total_amount[acc_id]: if gb_key not in total_amount[acc_id]["group_by_data"]: - total_amount[acc_id]["group_by_data"][ - gb_key - ] = self._prepare_total_amount(tb2, foreign_currency) + total_amount[acc_id]["group_by_data"][gb_key] = ( + self._prepare_total_amount(tb2, foreign_currency) + ) else: total_amount[acc_id]["group_by_data"][gb_key][ "initial_balance" @@ -598,19 +598,19 @@ class TrialBalanceReport(models.AbstractModel): total_amount[unaffected_id]["ending_balance"] += pl_initial_balance total_amount[unaffected_id]["initial_balance"] += pl_initial_balance if foreign_currency: - total_amount[unaffected_id][ - "ending_currency_balance" - ] += pl_initial_currency_balance - total_amount[unaffected_id][ - "initial_currency_balance" - ] += pl_initial_currency_balance + total_amount[unaffected_id]["ending_currency_balance"] += ( + pl_initial_currency_balance + ) + total_amount[unaffected_id]["initial_currency_balance"] += ( + pl_initial_currency_balance + ) if grouped_by: - total_amount[unaffected_id]["group_by_data"][0][ - "ending_balance" - ] = total_amount[unaffected_id]["ending_balance"] - total_amount[unaffected_id]["group_by_data"][0][ - "initial_balance" - ] = total_amount[unaffected_id]["initial_balance"] + total_amount[unaffected_id]["group_by_data"][0]["ending_balance"] = ( + total_amount[unaffected_id]["ending_balance"] + ) + total_amount[unaffected_id]["group_by_data"][0]["initial_balance"] = ( + total_amount[unaffected_id]["initial_balance"] + ) if foreign_currency: total_amount[unaffected_id]["group_by_data"][0][ "ending_currency_balance" @@ -833,12 +833,12 @@ class TrialBalanceReport(models.AbstractModel): "ending_balance" ] if foreign_currency: - groups_data[group_id][ - "initial_currency_balance" - ] += total_amount[acc_id]["initial_currency_balance"] - groups_data[group_id][ - "ending_currency_balance" - ] += total_amount[acc_id]["ending_currency_balance"] + groups_data[group_id]["initial_currency_balance"] += ( + total_amount[acc_id]["initial_currency_balance"] + ) + groups_data[group_id]["ending_currency_balance"] += ( + total_amount[acc_id]["ending_currency_balance"] + ) return groups_data def _get_report_values(self, docids, data): diff --git a/account_financial_report/static/description/index.html b/account_financial_report/static/description/index.html index 567a776d..2273c39c 100644 --- a/account_financial_report/static/description/index.html +++ b/account_financial_report/static/description/index.html @@ -369,7 +369,7 @@ ul.auto-toc { !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:4d56adc35fff26b88020bebb3cd0fcb302b7c7c7483639925cfc4f9b850d8ac4 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/account-financial-reporting Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/account-financial-reporting Translate me on Weblate Try me on Runboat

This module adds a set of financial reports. They are accessible under Invoicing / Reporting / OCA accounting reports.

    @@ -472,7 +472,7 @@ levels

    Bugs are tracked on GitHub Issues. 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 -feedback.

    +feedback.

    Do not contact contributors directly about support or help with technical issues.

@@ -538,7 +538,7 @@ in April 2016.

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/account-financial-reporting project on GitHub.

+

This module is part of the OCA/account-financial-reporting project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml index 8e3616d6..c4d75719 100644 --- a/account_financial_report/wizard/general_ledger_wizard_view.xml +++ b/account_financial_report/wizard/general_ledger_wizard_view.xml @@ -105,24 +105,24 @@