From da416248ac39bb68e17d85cdb3dbd1bee22ed91e Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Thu, 3 Nov 2022 23:25:22 +0100 Subject: [PATCH] [MIG] account_template_active from 14.0 to 16.0 - use new web_ribbon widget to display archived items on form views - change inheritance from account to account_usability regarding views that disappeared in V16 --- account_template_active/__manifest__.py | 4 +-- .../i18n/account_template_active.pot | 36 +++++-------------- account_template_active/i18n/fr.po | 16 ++++++--- .../models/account_account_template.py | 2 +- ...ccount_fiscal_position_account_template.py | 2 +- .../account_fiscal_position_tax_template.py | 2 +- .../account_fiscal_position_template.py | 2 +- account_template_active/readme/USAGE.rst | 2 +- account_template_active/tests/test_module.py | 4 +-- .../views/view_account_account_template.xml | 26 ++++++++++---- .../view_account_fiscal_position_template.xml | 12 +++++-- .../views/view_account_tax_template.xml | 12 ++++++- 12 files changed, 69 insertions(+), 51 deletions(-) diff --git a/account_template_active/__manifest__.py b/account_template_active/__manifest__.py index 4d8d72c4..ab391343 100644 --- a/account_template_active/__manifest__.py +++ b/account_template_active/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Disable Account Template Items", - "version": "14.0.1.0.0", + "version": "16.0.1.0.0", "category": "Accounting", "license": "AGPL-3", "summary": "Allow to disable / enable account template items" @@ -13,7 +13,7 @@ "maintainers": ["legalsylvain"], "website": "https://github.com/OCA/account-financial-tools", "depends": [ - "account_menu", + "account_usability", ], "data": [ "views/view_account_account_template.xml", diff --git a/account_template_active/i18n/account_template_active.pot b/account_template_active/i18n/account_template_active.pot index ed9a8547..3d6a4eba 100644 --- a/account_template_active/i18n/account_template_active.pot +++ b/account_template_active/i18n/account_template_active.pot @@ -1,11 +1,13 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_template_active +# * account_template_active # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-11-03 22:54+0000\n" +"PO-Revision-Date: 2022-11-03 22:54+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -27,30 +29,10 @@ msgid "Active" msgstr "" #. module: account_template_active -#: model:ir.model.fields,field_description:account_template_active.field_account_account_template__display_name -#: model:ir.model.fields,field_description:account_template_active.field_account_fiscal_position_account_template__display_name -#: model:ir.model.fields,field_description:account_template_active.field_account_fiscal_position_tax_template__display_name -#: model:ir.model.fields,field_description:account_template_active.field_account_fiscal_position_template__display_name -#: model:ir.model.fields,field_description:account_template_active.field_account_tax_template__display_name -msgid "Display Name" -msgstr "" - -#. module: account_template_active -#: model:ir.model.fields,field_description:account_template_active.field_account_account_template__id -#: model:ir.model.fields,field_description:account_template_active.field_account_fiscal_position_account_template__id -#: model:ir.model.fields,field_description:account_template_active.field_account_fiscal_position_tax_template__id -#: model:ir.model.fields,field_description:account_template_active.field_account_fiscal_position_template__id -#: model:ir.model.fields,field_description:account_template_active.field_account_tax_template__id -msgid "ID" -msgstr "" - -#. module: account_template_active -#: model:ir.model.fields,field_description:account_template_active.field_account_account_template____last_update -#: model:ir.model.fields,field_description:account_template_active.field_account_fiscal_position_account_template____last_update -#: model:ir.model.fields,field_description:account_template_active.field_account_fiscal_position_tax_template____last_update -#: model:ir.model.fields,field_description:account_template_active.field_account_fiscal_position_template____last_update -#: model:ir.model.fields,field_description:account_template_active.field_account_tax_template____last_update -msgid "Last Modified on" +#: model_terms:ir.ui.view,arch_db:account_template_active.view_account_fiscal_position_template_form +#: model_terms:ir.ui.view,arch_db:account_template_active.view_account_tax_template_form +#: model_terms:ir.ui.view,arch_db:account_template_active.view_account_template_form +msgid "Archived" msgstr "" #. module: account_template_active @@ -71,4 +53,4 @@ msgstr "" #. module: account_template_active #: model:ir.model,name:account_template_active.model_account_tax_template msgid "Templates for Taxes" -msgstr "" +msgstr "" \ No newline at end of file diff --git a/account_template_active/i18n/fr.po b/account_template_active/i18n/fr.po index 1d6b2722..d20183d2 100644 --- a/account_template_active/i18n/fr.po +++ b/account_template_active/i18n/fr.po @@ -4,11 +4,11 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-04 16:57+0000\n" -"PO-Revision-Date: 2020-05-04 16:57+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2022-11-03 22:52+0000\n" +"PO-Revision-Date: 2022-11-03 22:52+0000\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,6 +28,13 @@ msgstr "Modèle de mapping de compte de position fiscale" msgid "Active" msgstr "Actif" +#. module: account_template_active +#: model_terms:ir.ui.view,arch_db:account_template_active.view_account_fiscal_position_template_form +#: model_terms:ir.ui.view,arch_db:account_template_active.view_account_tax_template_form +#: model_terms:ir.ui.view,arch_db:account_template_active.view_account_template_form +msgid "Archived" +msgstr "Archivé·e" + #. module: account_template_active #: model:ir.model,name:account_template_active.model_account_fiscal_position_tax_template msgid "Tax Mapping Template of Fiscal Position" @@ -47,4 +54,3 @@ msgstr "Modèles pour les comptes" #: model:ir.model,name:account_template_active.model_account_tax_template msgid "Templates for Taxes" msgstr "Modèles pour les taxes" - diff --git a/account_template_active/models/account_account_template.py b/account_template_active/models/account_account_template.py index 2ca7283a..990142c7 100644 --- a/account_template_active/models/account_account_template.py +++ b/account_template_active/models/account_account_template.py @@ -8,7 +8,7 @@ from odoo import fields, models class AccountAccountTemplate(models.Model): _inherit = "account.account.template" - active = fields.Boolean(string="Active", default=True) + active = fields.Boolean(default=True) def write(self, vals): FpaTemplate = self.env["account.fiscal.position.account.template"] diff --git a/account_template_active/models/account_fiscal_position_account_template.py b/account_template_active/models/account_fiscal_position_account_template.py index 27261c25..e49a210d 100644 --- a/account_template_active/models/account_fiscal_position_account_template.py +++ b/account_template_active/models/account_fiscal_position_account_template.py @@ -8,7 +8,7 @@ from odoo import fields, models class AccountFiscalPositionAccountTemplate(models.Model): _inherit = "account.fiscal.position.account.template" - active = fields.Boolean("Active", default=True) + active = fields.Boolean(default=True) def write(self, vals): AccountTemplate = self.env["account.account.template"] diff --git a/account_template_active/models/account_fiscal_position_tax_template.py b/account_template_active/models/account_fiscal_position_tax_template.py index 9c3a61e7..48ccb2f6 100644 --- a/account_template_active/models/account_fiscal_position_tax_template.py +++ b/account_template_active/models/account_fiscal_position_tax_template.py @@ -8,7 +8,7 @@ from odoo import fields, models class AccountFiscalPositionTaxTemplate(models.Model): _inherit = "account.fiscal.position.tax.template" - active = fields.Boolean("Active", default=True) + active = fields.Boolean(default=True) def write(self, vals): TaxTemplate = self.env["account.tax.template"] diff --git a/account_template_active/models/account_fiscal_position_template.py b/account_template_active/models/account_fiscal_position_template.py index a6e24910..71fc504d 100644 --- a/account_template_active/models/account_fiscal_position_template.py +++ b/account_template_active/models/account_fiscal_position_template.py @@ -8,4 +8,4 @@ from odoo import fields, models class AccountFiscalPositionTemplate(models.Model): _inherit = "account.fiscal.position.template" - active = fields.Boolean("Active", default=True) + active = fields.Boolean(default=True) diff --git a/account_template_active/readme/USAGE.rst b/account_template_active/readme/USAGE.rst index eac174b4..25e6ba53 100644 --- a/account_template_active/readme/USAGE.rst +++ b/account_template_active/readme/USAGE.rst @@ -1,2 +1,2 @@ -* Go to Configuration > Templates +* Go to Accounting > Configuration > Templates * Select then the template you want to change. diff --git a/account_template_active/tests/test_module.py b/account_template_active/tests/test_module.py index 81a4e9a3..da8c8a72 100644 --- a/account_template_active/tests/test_module.py +++ b/account_template_active/tests/test_module.py @@ -15,8 +15,6 @@ class TestModule(TransactionCase): self.AFPATemplate = self.env["account.fiscal.position.account.template"] self.AFPTTemplate = self.env["account.fiscal.position.tax.template"] - self.receivable_type = self.env.ref("account.data_account_type_receivable") - self.template = self.ACTemplate.create( { "name": "Chart of Account", @@ -31,7 +29,7 @@ class TestModule(TransactionCase): { "name": "Account Template", "code": "CODE", - "user_type_id": self.receivable_type.id, + "account_type": "asset_receivable", "chart_template_id": self.template.id, } ) diff --git a/account_template_active/views/view_account_account_template.xml b/account_template_active/views/view_account_account_template.xml index d6813348..5d68cb40 100644 --- a/account_template_active/views/view_account_account_template.xml +++ b/account_template_active/views/view_account_account_template.xml @@ -9,29 +9,43 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). account.account.template - + not active - - + + account.account.template - + + + + - + {"active_test": False} diff --git a/account_template_active/views/view_account_fiscal_position_template.xml b/account_template_active/views/view_account_fiscal_position_template.xml index 48bd9bfe..55d02a4e 100644 --- a/account_template_active/views/view_account_fiscal_position_template.xml +++ b/account_template_active/views/view_account_fiscal_position_template.xml @@ -24,8 +24,16 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). account.fiscal.position.template + + + - + not active @@ -58,7 +66,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). {"active_test": False} diff --git a/account_template_active/views/view_account_tax_template.xml b/account_template_active/views/view_account_tax_template.xml index c6f78ea9..759ca30a 100644 --- a/account_template_active/views/view_account_tax_template.xml +++ b/account_template_active/views/view_account_tax_template.xml @@ -18,15 +18,25 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + account.tax.template + + + - + + {"active_test": False}