From d50d8d1af7a6e0814543a32b4357ab6a96b076cf Mon Sep 17 00:00:00 2001 From: mariadforgeflow Date: Fri, 4 Feb 2022 15:59:23 +0100 Subject: [PATCH] [MIG] partner_statement: Migration to 15.0 --- partner_statement/__manifest__.py | 10 +- partner_statement/readme/CONFIGURE.rst | 4 +- .../tests/test_activity_statement.py | 30 +++-- .../tests/test_outstanding_statement.py | 30 +++-- partner_statement/views/assets.xml | 18 --- .../views/res_config_settings.xml | 127 +++++++++--------- 6 files changed, 110 insertions(+), 109 deletions(-) delete mode 100644 partner_statement/views/assets.xml diff --git a/partner_statement/__manifest__.py b/partner_statement/__manifest__.py index e93af0df..778b2f9c 100644 --- a/partner_statement/__manifest__.py +++ b/partner_statement/__manifest__.py @@ -1,9 +1,9 @@ -# Copyright 2018 ForgeFlow, S.L. (http://www.forgeflow.com) +# Copyright 2022 ForgeFlow, S.L. (http://www.forgeflow.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "Partner Statement", - "version": "14.0.1.1.0", + "version": "15.0.1.0.0", "category": "Accounting & Finance", "summary": "OCA Financial Reports", "author": "ForgeFlow, Odoo Community Association (OCA)", @@ -16,11 +16,15 @@ "security/statement_security.xml", "views/activity_statement.xml", "views/outstanding_statement.xml", - "views/assets.xml", "views/aging_buckets.xml", "views/res_config_settings.xml", "wizard/statement_wizard.xml", ], + "assets": { + "web.report_assets_common": [ + "/partner_statement/static/src/scss/layout_statement.scss", + ], + }, "installable": True, "application": False, } diff --git a/partner_statement/readme/CONFIGURE.rst b/partner_statement/readme/CONFIGURE.rst index 3242049d..a55b1cec 100644 --- a/partner_statement/readme/CONFIGURE.rst +++ b/partner_statement/readme/CONFIGURE.rst @@ -6,8 +6,8 @@ Users willing to access to this report should have proper Accounting & Finance r To configure this module, you need to: -#. Go to *Configuration / Settings* -#. Under the *Followup Section* of *Accounting* option select either or both of OCA Activity or Outstanding Statement +#. Go to *Invoicing / Configuration / Settings* +#. Under the *Partner Statements* of *Accounting* option select either or both of OCA Activity or Outstanding Statement #. Once selected, you may set default options for the reports. #. Click *Save* diff --git a/partner_statement/tests/test_activity_statement.py b/partner_statement/tests/test_activity_statement.py index 7b78c67b..5e2fbbcb 100644 --- a/partner_statement/tests/test_activity_statement.py +++ b/partner_statement/tests/test_activity_statement.py @@ -56,25 +56,31 @@ class TestActivityStatement(TransactionCase): statement = wiz_id.button_export_pdf() - self.assertDictContainsSubset( - { - "type": "ir.actions.report", - "report_name": self.report_name, - "report_type": "qweb-pdf", - }, + self.assertDictEqual( statement, + { + **{ + "type": "ir.actions.report", + "report_name": self.report_name, + "report_type": "qweb-pdf", + }, + **statement, + }, "There was an error and the PDF report was not generated.", ) statement_xlsx = wiz_id.button_export_xlsx() - self.assertDictContainsSubset( - { - "type": "ir.actions.report", - "report_name": self.report_name_xlsx, - "report_type": "xlsx", - }, + self.assertDictEqual( statement_xlsx, + { + **{ + "type": "ir.actions.report", + "report_name": self.report_name_xlsx, + "report_type": "xlsx", + }, + **statement_xlsx, + }, "There was an error and the PDF report was not generated.", ) diff --git a/partner_statement/tests/test_outstanding_statement.py b/partner_statement/tests/test_outstanding_statement.py index baede255..372da95d 100644 --- a/partner_statement/tests/test_outstanding_statement.py +++ b/partner_statement/tests/test_outstanding_statement.py @@ -52,25 +52,31 @@ class TestOutstandingStatement(TransactionCase): statement = wiz_id.button_export_pdf() - self.assertDictContainsSubset( - { - "type": "ir.actions.report", - "report_name": self.report_name, - "report_type": "qweb-pdf", - }, + self.assertDictEqual( statement, + { + **{ + "type": "ir.actions.report", + "report_name": self.report_name, + "report_type": "qweb-pdf", + }, + **statement, + }, "There was an error and the PDF report was not generated.", ) statement_xlsx = wiz_id.button_export_xlsx() - self.assertDictContainsSubset( - { - "type": "ir.actions.report", - "report_name": self.report_name_xlsx, - "report_type": "xlsx", - }, + self.assertDictEqual( statement_xlsx, + { + **{ + "type": "ir.actions.report", + "report_name": self.report_name_xlsx, + "report_type": "xlsx", + }, + **statement_xlsx, + }, "There was an error and the PDF report was not generated.", ) diff --git a/partner_statement/views/assets.xml b/partner_statement/views/assets.xml deleted file mode 100644 index 69a7557b..00000000 --- a/partner_statement/views/assets.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/partner_statement/views/res_config_settings.xml b/partner_statement/views/res_config_settings.xml index 5dda8318..42b6f26e 100644 --- a/partner_statement/views/res_config_settings.xml +++ b/partner_statement/views/res_config_settings.xml @@ -7,76 +7,79 @@ -
-
- -
-
-