From f4ce705ab232dfbbc7096e922860489556f784d4 Mon Sep 17 00:00:00 2001 From: Fekete Mihai Date: Sat, 3 Mar 2018 17:44:53 +0200 Subject: [PATCH] Update links in report, add account group file, update trial balance with hierarchy. Update indentation, remove empty lines from header. Update test. Update pylint. Remove company_id on computing accounts, since account.group is not a company based model, filtering accounts is done on trial balance report. Update account variables. Improve condition in padding on accounts. Add option to print hierarchy based on defined accounts/computed accounts. Add VAT report, hierarchy from tax tags ans taxes. Fix pylint, xlsx report generation header. Update code to select code_prefix or name. Update code to select code_prefix or name. Update code to select code_prefix or name. Fix domain in base amounts in vat report. Change trial balance code_prefix or name. Update trail balance, add tests for vat report. Update pylint, amounts as monetary, many2one option on generation excels. Update pulint. Add VAT Report in readme. Add VAT Report in readme. Update array_agg. Update array_agg. Update array_agg. Add option in VAT Report to be printed on Tax Tags - Tax Groups. Add widget to hierarchy_on on trial balance. --- account_financial_report/README.rst | 2 + account_financial_report/__manifest__.py | 6 +- account_financial_report/menuitems.xml | 7 + account_financial_report/models/__init__.py | 6 +- account_financial_report/models/account.py | 1 - .../models/account_group.py | 48 ++ account_financial_report/report/__init__.py | 3 +- .../report/abstract_report_xlsx.py | 5 +- .../report/aged_partner_balance.py | 4 +- .../report/aged_partner_balance_xlsx.py | 119 +++-- .../report/general_ledger.py | 15 +- .../report/general_ledger_xlsx.py | 13 +- account_financial_report/report/open_items.py | 10 +- .../report/open_items_xlsx.py | 10 +- .../report/templates/aged_partner_balance.xml | 300 ++++++++---- .../report/templates/general_ledger.xml | 241 ++++++++-- .../report/templates/open_items.xml | 38 +- .../report/templates/trial_balance.xml | 337 +++++++++++++- .../report/templates/vat_report.xml | 169 +++++++ .../report/trial_balance.py | 263 ++++++++++- .../report/trial_balance_xlsx.py | 9 +- account_financial_report/report/vat_report.py | 351 ++++++++++++++ .../report/vat_report_xlsx.py | 51 ++ account_financial_report/reports.xml | 32 ++ .../js/account_financial_report_backend.js | 8 +- .../js/account_financial_report_widgets.js | 19 +- account_financial_report/tests/__init__.py | 2 + .../tests/abstract_test.py | 4 +- .../tests/abstract_test_tax_report.py | 75 +++ .../tests/test_aged_partner_balance.py | 1 - .../tests/test_general_ledger.py | 20 +- .../tests/test_open_items.py | 1 - .../tests/test_trial_balance.py | 440 +++++++++++++++++- .../tests/test_vat_report.py | 288 ++++++++++++ .../view/account_view.xml | 28 -- .../view/report_template.xml | 6 + .../view/report_trial_balance.xml | 4 +- .../view/report_vat_report.xml | 9 + account_financial_report/wizard/__init__.py | 6 +- .../wizard/open_items_wizard.py | 1 - .../wizard/trial_balance_wizard.py | 9 +- .../wizard/trial_balance_wizard_view.xml | 1 + .../wizard/vat_report_wizard.py | 80 ++++ .../wizard/vat_report_wizard_view.xml | 44 ++ 44 files changed, 2739 insertions(+), 347 deletions(-) create mode 100644 account_financial_report/models/account_group.py create mode 100644 account_financial_report/report/templates/vat_report.xml create mode 100644 account_financial_report/report/vat_report.py create mode 100644 account_financial_report/report/vat_report_xlsx.py create mode 100644 account_financial_report/tests/abstract_test_tax_report.py create mode 100644 account_financial_report/tests/test_vat_report.py create mode 100755 account_financial_report/view/report_vat_report.xml create mode 100644 account_financial_report/wizard/vat_report_wizard.py create mode 100755 account_financial_report/wizard/vat_report_wizard_view.xml diff --git a/account_financial_report/README.rst b/account_financial_report/README.rst index ec4cdd12..db65e376 100644 --- a/account_financial_report/README.rst +++ b/account_financial_report/README.rst @@ -13,6 +13,7 @@ Accounting / Reporting / OCA Reports. - Trial Balance - Open Items - Aged Partner Balance +- VAT Report .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot @@ -52,6 +53,7 @@ Contributors * Julien Coux * Akim Juillerat * Alexis de Lattre +* Mihai Fekete Much of the work in this module was done at a sprint in Sorrento, Italy in April 2016. diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index 01937685..9f48445f 100644 --- a/account_financial_report/__manifest__.py +++ b/account_financial_report/__manifest__.py @@ -1,11 +1,10 @@ - # Author: Damien Crier # Author: Julien Coux # Copyright 2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Account Financial Reports', - 'version': '11.0.1.2.0', + 'version': '11.0.2.0.0', 'category': 'Reporting', 'summary': 'OCA Financial Reports', 'author': 'Camptocamp SA,' @@ -24,6 +23,7 @@ 'wizard/general_ledger_wizard_view.xml', 'wizard/open_items_wizard_view.xml', 'wizard/trial_balance_wizard_view.xml', + 'wizard/vat_report_wizard_view.xml', 'menuitems.xml', 'reports.xml', 'report/templates/layouts.xml', @@ -31,12 +31,14 @@ 'report/templates/general_ledger.xml', 'report/templates/open_items.xml', 'report/templates/trial_balance.xml', + 'report/templates/vat_report.xml', 'view/account_view.xml', 'view/report_template.xml', 'view/report_general_ledger.xml', 'view/report_trial_balance.xml', 'view/report_open_items.xml', 'view/report_aged_partner_balance.xml', + 'view/report_vat_report.xml', ], 'installable': True, 'application': True, diff --git a/account_financial_report/menuitems.xml b/account_financial_report/menuitems.xml index 4d36885f..cbbd4458 100644 --- a/account_financial_report/menuitems.xml +++ b/account_financial_report/menuitems.xml @@ -35,6 +35,13 @@ id="menu_aged_partner_balance_wizard" sequence="40" /> + + -