From a1cac726b5862d2936d9c1814ae7ad6dfcfc0c5c Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Mon, 10 Oct 2022 00:17:49 +0200
Subject: [PATCH] [MIG] account_usability from 15.0 to 16.0 - account.tax.group
 views : remove views as there are now included in odoo account module -
 account.account.template views : port privatized views in odoo 16.0 from Odoo
 15.0 CE. - account.account.tag views : adapt to V16 -
 account.fiscal.position.template views : add missing fields - account.group
 views : adapt to V16 - account.type views : remove as the model disappeared -
 account.chart.template views : port privatized views in odoo 16.0 from Odoo
 15.0 CE. - improve documentation - FIX : remove useless duplicated fr_FR.po
 file - ADD : display again 'Show full accounting features' group that is
 hidden in CE release

---
 account_usability/__manifest__.py             |  12 +-
 account_usability/data/ir_module_category.xml |  13 ++
 account_usability/i18n/account_usability.pot  |  84 +++++++--
 account_usability/i18n/fr.po                  | 116 +++++++-----
 account_usability/i18n/fr_FR.po               | 170 ------------------
 account_usability/readme/DESCRIPTION.rst      |  38 ++--
 account_usability/readme/ROADMAP.rst          |   3 +-
 account_usability/security/res_groups.xml     |  31 ++++
 account_usability/views/menu.xml              |   6 +
 .../views/view_account_account_template.xml   |  72 ++++++++
 .../views/view_account_chart_template.xml     |  91 +++++++++-
 .../view_account_fiscal_position_template.xml |  36 ++++
 .../views/view_account_group.xml              |  19 +-
 account_usability/views/view_account_tag.xml  |   6 -
 .../views/view_account_tax_group.xml          |  68 -------
 account_usability/views/view_account_type.xml |   9 -
 .../odoo/addons/account_usability             |   1 +
 setup/account_usability/setup.py              |   6 +
 18 files changed, 431 insertions(+), 350 deletions(-)
 create mode 100644 account_usability/data/ir_module_category.xml
 delete mode 100644 account_usability/i18n/fr_FR.po
 create mode 100644 account_usability/security/res_groups.xml
 delete mode 100644 account_usability/views/view_account_tax_group.xml
 delete mode 100644 account_usability/views/view_account_type.xml
 create mode 120000 setup/account_usability/odoo/addons/account_usability
 create mode 100644 setup/account_usability/setup.py

diff --git a/account_usability/__manifest__.py b/account_usability/__manifest__.py
index 5c0e34f6..32d78154 100644
--- a/account_usability/__manifest__.py
+++ b/account_usability/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "Account - Missing Menus & Saxon Accounting",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Accounting",
     "license": "AGPL-3",
     "summary": "Adds missing menu entries for Account module and"
@@ -14,17 +14,17 @@
     "website": "https://github.com/OCA/account-financial-tools",
     "depends": ["account"],
     "data": [
+        "data/ir_module_category.xml",
+        "security/res_groups.xml",
         "views/menu.xml",
         "views/res_config_settings_views.xml",
-        "views/view_account_account_template.xml",
         "views/view_account_bank_statement.xml",
-        "views/view_account_chart_template.xml",
-        "views/view_account_fiscal_position_template.xml",
         "views/view_account_group.xml",
         "views/view_account_tag.xml",
-        "views/view_account_tax_group.xml",
+        "views/view_account_chart_template.xml",
+        "views/view_account_account_template.xml",
         "views/view_account_tax_template.xml",
-        "views/view_account_type.xml",
+        "views/view_account_fiscal_position_template.xml",
     ],
     "demo": ["demo/res_groups.xml"],
     "installable": True,
diff --git a/account_usability/data/ir_module_category.xml b/account_usability/data/ir_module_category.xml
new file mode 100644
index 00000000..ed236277
--- /dev/null
+++ b/account_usability/data/ir_module_category.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+    Copyright (C) 2022-Today GRAP (http://www.grap.coop)
+    @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
+    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
+<odoo>
+    <!-- Rename groups to fit with EE naming 'Billing' -> 'Accounting' -->
+    <record id="base.module_category_accounting_accounting" model="ir.module.category">
+        <field name="name">Accounting</field>
+    </record>
+
+</odoo>
diff --git a/account_usability/i18n/account_usability.pot b/account_usability/i18n/account_usability.pot
index a0b3e385..25c29383 100644
--- a/account_usability/i18n/account_usability.pot
+++ b/account_usability/i18n/account_usability.pot
@@ -1,11 +1,13 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* account_usability
+#   * account_usability
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 16.0beta\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-10-10 12:42+0000\n"
+"PO-Revision-Date: 2022-10-10 12:42+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -36,16 +38,9 @@ msgid "Account Tags"
 msgstr ""
 
 #. module: account_usability
-#: model_terms:ir.ui.view,arch_db:account_usability.view_account_tax_group_form
-#: model_terms:ir.ui.view,arch_db:account_usability.view_account_tax_group_search
-msgid "Account Tax Group"
-msgstr ""
-
-#. module: account_usability
-#: model:ir.actions.act_window,name:account_usability.action_account_tax_group
-#: model:ir.ui.menu,name:account_usability.account_tax_group_menu
-#: model_terms:ir.ui.view,arch_db:account_usability.view_account_tax_group_search
-msgid "Account Tax Groups"
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_search
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Account Template"
 msgstr ""
 
 #. module: account_usability
@@ -55,13 +50,14 @@ msgid "Account Templates"
 msgstr ""
 
 #. module: account_usability
-#: model:ir.ui.menu,name:account_usability.account_type_menu
-msgid "Account Types"
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_search
+msgid "Account Type"
 msgstr ""
 
 #. module: account_usability
 #: model:ir.model.fields,field_description:account_usability.field_account_account_tag__account_ids
 #: model:ir.model.fields,field_description:account_usability.field_account_group__account_ids
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_group_form
 msgid "Accounts"
 msgstr ""
 
@@ -86,6 +82,7 @@ msgid "Cash Registers"
 msgstr ""
 
 #. module: account_usability
+#: model:ir.actions.act_window,name:account_usability.action_account_chart_template_form
 #: model:ir.ui.menu,name:account_usability.menu_account_chart_template
 msgid "Chart of Accounts Templates"
 msgstr ""
@@ -95,12 +92,69 @@ msgstr ""
 msgid "Config Settings"
 msgstr ""
 
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_form
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_form
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Expense Account"
+msgstr ""
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_fiscal_position_template_form
+msgid "Extra configuration"
+msgstr ""
+
 #. module: account_usability
 #: model:ir.actions.act_window,name:account_usability.account_fiscal_position_template_action
 #: model:ir.ui.menu,name:account_usability.menu_account_fiscal_position_template
 msgid "Fiscal Position Templates"
 msgstr ""
 
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_search
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Group By"
+msgstr ""
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Income Account"
+msgstr ""
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_form
+msgid "Internal notes..."
+msgstr ""
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_fiscal_position_template_form
+msgid "Note"
+msgstr ""
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_form
+msgid "Notes"
+msgstr ""
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Payable Account"
+msgstr ""
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_form
+msgid "Properties"
+msgstr ""
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Receivable Account"
+msgstr ""
+
 #. module: account_usability
 #: model_terms:ir.ui.view,arch_db:account_usability.res_config_settings_view_form
 msgid ""
@@ -139,4 +193,4 @@ msgstr ""
 #. module: account_usability
 #: model:ir.model.fields,field_description:account_usability.field_res_config_settings__anglo_saxon_accounting
 msgid "Use anglo-saxon accounting"
-msgstr ""
+msgstr ""
\ No newline at end of file
diff --git a/account_usability/i18n/fr.po b/account_usability/i18n/fr.po
index f6b38f89..46042163 100644
--- a/account_usability/i18n/fr.po
+++ b/account_usability/i18n/fr.po
@@ -1,20 +1,19 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* account_usability
+#   * account_usability
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 16.0beta\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-03-17 18:45+0000\n"
-"Last-Translator: Pierre Verkest <pierreverkest84@gmail.com>\n"
-"Language-Team: none\n"
-"Language: fr\n"
+"POT-Creation-Date: 2022-10-10 12:39+0000\n"
+"PO-Revision-Date: 2022-10-10 12:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.3.2\n"
+"Plural-Forms: \n"
 
 #. module: account_usability
 #: model:ir.model,name:account_usability.model_account_group
@@ -39,17 +38,10 @@ msgid "Account Tags"
 msgstr "Étiquettes de compte"
 
 #. module: account_usability
-#: model_terms:ir.ui.view,arch_db:account_usability.view_account_tax_group_form
-#: model_terms:ir.ui.view,arch_db:account_usability.view_account_tax_group_search
-msgid "Account Tax Group"
-msgstr "Compte du groupe de taxe"
-
-#. module: account_usability
-#: model:ir.actions.act_window,name:account_usability.action_account_tax_group
-#: model:ir.ui.menu,name:account_usability.account_tax_group_menu
-#: model_terms:ir.ui.view,arch_db:account_usability.view_account_tax_group_search
-msgid "Account Tax Groups"
-msgstr "Comptes des groupes de taxes"
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_search
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Account Template"
+msgstr "Modèles de comptes"
 
 #. module: account_usability
 #: model:ir.actions.act_window,name:account_usability.account_account_template_action
@@ -58,20 +50,21 @@ msgid "Account Templates"
 msgstr "Modèles de compte"
 
 #. module: account_usability
-#: model:ir.ui.menu,name:account_usability.account_type_menu
-msgid "Account Types"
-msgstr "Types de compte"
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_search
+msgid "Account Type"
+msgstr "Type comptable"
 
 #. module: account_usability
 #: model:ir.model.fields,field_description:account_usability.field_account_account_tag__account_ids
 #: model:ir.model.fields,field_description:account_usability.field_account_group__account_ids
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_group_form
 msgid "Accounts"
 msgstr "Comptes"
 
 #. module: account_usability
 #: model_terms:ir.ui.view,arch_db:account_usability.res_config_settings_view_form
 msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "Comptabilité anglo-saxonne"
 
 #. module: account_usability
 #: model:ir.ui.menu,name:account_usability.menu_accounting_statement_bank
@@ -89,6 +82,7 @@ msgid "Cash Registers"
 msgstr "Registres de caisse"
 
 #. module: account_usability
+#: model:ir.actions.act_window,name:account_usability.action_account_chart_template_form
 #: model:ir.ui.menu,name:account_usability.menu_account_chart_template
 msgid "Chart of Accounts Templates"
 msgstr "Modèle de plan comptable"
@@ -96,15 +90,23 @@ msgstr "Modèle de plan comptable"
 #. module: account_usability
 #: model:ir.model,name:account_usability.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Paramètres de config"
 
 #. module: account_usability
-#: model:ir.model.fields,field_description:account_usability.field_account_account_tag__display_name
-#: model:ir.model.fields,field_description:account_usability.field_account_group__display_name
-#: model:ir.model.fields,field_description:account_usability.field_account_tax_group__display_name
-#: model:ir.model.fields,field_description:account_usability.field_res_config_settings__display_name
-msgid "Display Name"
-msgstr ""
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_form
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_form
+msgid "Default Taxes"
+msgstr "Taxes par défaut"
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Expense Account"
+msgstr "Compte de dépense"
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_fiscal_position_template_form
+msgid "Extra configuration"
+msgstr "Configuration complémentaire"
 
 #. module: account_usability
 #: model:ir.actions.act_window,name:account_usability.account_fiscal_position_template_action
@@ -113,27 +115,51 @@ msgid "Fiscal Position Templates"
 msgstr "Modèle de position fiscale"
 
 #. module: account_usability
-#: model:ir.model.fields,field_description:account_usability.field_account_account_tag__id
-#: model:ir.model.fields,field_description:account_usability.field_account_group__id
-#: model:ir.model.fields,field_description:account_usability.field_account_tax_group__id
-#: model:ir.model.fields,field_description:account_usability.field_res_config_settings__id
-msgid "ID"
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_search
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Group By"
+msgstr "Rgrouper par"
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Income Account"
+msgstr "Compte de revenu"
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_form
+msgid "Internal notes..."
+msgstr "Notes internes ..."
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_fiscal_position_template_form
+msgid "Note"
 msgstr ""
 
 #. module: account_usability
-#: model:ir.model.fields,field_description:account_usability.field_account_account_tag____last_update
-#: model:ir.model.fields,field_description:account_usability.field_account_group____last_update
-#: model:ir.model.fields,field_description:account_usability.field_account_tax_group____last_update
-#: model:ir.model.fields,field_description:account_usability.field_res_config_settings____last_update
-msgid "Last Modified on"
-msgstr "Dernière modification le"
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_account_template_form
+msgid "Notes"
+msgstr ""
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Payable Account"
+msgstr "Compte fournisseur"
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_form
+msgid "Properties"
+msgstr "Propriétés"
+
+#. module: account_usability
+#: model_terms:ir.ui.view,arch_db:account_usability.view_account_chart_template_seacrh
+msgid "Receivable Account"
+msgstr "Compte client"
 
 #. module: account_usability
 #: model_terms:ir.ui.view,arch_db:account_usability.res_config_settings_view_form
 msgid ""
 "Record the cost of a good as an expense when this good is\n"
-"                                invoiced to a final customer (instead of "
-"recording the cost as soon\n"
+"                                invoiced to a final customer (instead of recording the cost as soon\n"
 "                                as the product is received in stock)."
 msgstr ""
 
@@ -152,12 +178,12 @@ msgstr "Groupe de taxe"
 #. module: account_usability
 #: model:ir.ui.menu,name:account_usability.menu_account_tax_template
 msgid "Tax Templates"
-msgstr "Modèle de taxe"
+msgstr "Modèles de taxe"
 
 #. module: account_usability
 #: model:ir.model.fields,field_description:account_usability.field_account_tax_group__tax_ids
 msgid "Taxes"
-msgstr "Taxes"
+msgstr ""
 
 #. module: account_usability
 #: model:ir.ui.menu,name:account_usability.menu_account_coa_settings
diff --git a/account_usability/i18n/fr_FR.po b/account_usability/i18n/fr_FR.po
deleted file mode 100644
index 322268e9..00000000
--- a/account_usability/i18n/fr_FR.po
+++ /dev/null
@@ -1,170 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* account_usability
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-04-10 15:46+0000\n"
-"Last-Translator: Yves Le Doeuff <yld@alliasys.fr>\n"
-"Language-Team: none\n"
-"Language: fr_FR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.3.2\n"
-
-#. module: account_usability
-#: model:ir.model,name:account_usability.model_account_group
-msgid "Account Group"
-msgstr "Groupe de compte"
-
-#. module: account_usability
-#: model:ir.actions.act_window,name:account_usability.account_group_action
-#: model:ir.ui.menu,name:account_usability.account_group_menu
-msgid "Account Groups"
-msgstr "Groupes de compte"
-
-#. module: account_usability
-#: model:ir.model,name:account_usability.model_account_account_tag
-msgid "Account Tag"
-msgstr "Étiquette de compte"
-
-#. module: account_usability
-#: model:ir.actions.act_window,name:account_usability.account_account_tag_action
-#: model:ir.ui.menu,name:account_usability.account_tag_menu
-msgid "Account Tags"
-msgstr "Étiquettes de compte"
-
-#. module: account_usability
-#: model_terms:ir.ui.view,arch_db:account_usability.view_account_tax_group_form
-#: model_terms:ir.ui.view,arch_db:account_usability.view_account_tax_group_search
-msgid "Account Tax Group"
-msgstr "Compte du groupe de taxe"
-
-#. module: account_usability
-#: model:ir.actions.act_window,name:account_usability.action_account_tax_group
-#: model:ir.ui.menu,name:account_usability.account_tax_group_menu
-#: model_terms:ir.ui.view,arch_db:account_usability.view_account_tax_group_search
-msgid "Account Tax Groups"
-msgstr "Comptes des groupes de taxes"
-
-#. module: account_usability
-#: model:ir.actions.act_window,name:account_usability.account_account_template_action
-#: model:ir.ui.menu,name:account_usability.menu_account_account_template
-msgid "Account Templates"
-msgstr "Modèles de compte"
-
-#. module: account_usability
-#: model:ir.ui.menu,name:account_usability.account_type_menu
-msgid "Account Types"
-msgstr "Types de compte"
-
-#. module: account_usability
-#: model:ir.model.fields,field_description:account_usability.field_account_account_tag__account_ids
-#: model:ir.model.fields,field_description:account_usability.field_account_group__account_ids
-msgid "Accounts"
-msgstr "Comptes"
-
-#. module: account_usability
-#: model_terms:ir.ui.view,arch_db:account_usability.res_config_settings_view_form
-msgid "Anglo-Saxon Accounting"
-msgstr ""
-
-#. module: account_usability
-#: model:ir.ui.menu,name:account_usability.menu_accounting_statement_bank
-msgid "Bank Statements"
-msgstr "Relevés bancaires"
-
-#. module: account_usability
-#: model:ir.ui.menu,name:account_usability.menu_accounting_bank_and_cash
-msgid "Bank and Cash"
-msgstr "Banque et caisse"
-
-#. module: account_usability
-#: model:ir.ui.menu,name:account_usability.menu_accounting_statement_cash
-msgid "Cash Registers"
-msgstr "Registres de caisse"
-
-#. module: account_usability
-#: model:ir.ui.menu,name:account_usability.menu_account_chart_template
-msgid "Chart of Accounts Templates"
-msgstr "Modèle de plan comptable"
-
-#. module: account_usability
-#: model:ir.model,name:account_usability.model_res_config_settings
-msgid "Config Settings"
-msgstr ""
-
-#. module: account_usability
-#: model:ir.model.fields,field_description:account_usability.field_account_account_tag__display_name
-#: model:ir.model.fields,field_description:account_usability.field_account_group__display_name
-#: model:ir.model.fields,field_description:account_usability.field_account_tax_group__display_name
-#: model:ir.model.fields,field_description:account_usability.field_res_config_settings__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: account_usability
-#: model:ir.actions.act_window,name:account_usability.account_fiscal_position_template_action
-#: model:ir.ui.menu,name:account_usability.menu_account_fiscal_position_template
-msgid "Fiscal Position Templates"
-msgstr "Modèle de position fiscale"
-
-#. module: account_usability
-#: model:ir.model.fields,field_description:account_usability.field_account_account_tag__id
-#: model:ir.model.fields,field_description:account_usability.field_account_group__id
-#: model:ir.model.fields,field_description:account_usability.field_account_tax_group__id
-#: model:ir.model.fields,field_description:account_usability.field_res_config_settings__id
-msgid "ID"
-msgstr ""
-
-#. module: account_usability
-#: model:ir.model.fields,field_description:account_usability.field_account_account_tag____last_update
-#: model:ir.model.fields,field_description:account_usability.field_account_group____last_update
-#: model:ir.model.fields,field_description:account_usability.field_account_tax_group____last_update
-#: model:ir.model.fields,field_description:account_usability.field_res_config_settings____last_update
-msgid "Last Modified on"
-msgstr "Dernière modification le"
-
-#. module: account_usability
-#: model_terms:ir.ui.view,arch_db:account_usability.res_config_settings_view_form
-msgid ""
-"Record the cost of a good as an expense when this good is\n"
-"                                invoiced to a final customer (instead of "
-"recording the cost as soon\n"
-"                                as the product is received in stock)."
-msgstr ""
-
-#. module: account_usability
-#: model:ir.model.fields,help:account_usability.field_res_config_settings__anglo_saxon_accounting
-msgid ""
-"Record the cost of a good as an expense when this good is invoiced to a "
-"final customer."
-msgstr ""
-
-#. module: account_usability
-#: model:ir.model,name:account_usability.model_account_tax_group
-msgid "Tax Group"
-msgstr "Groupe de taxe"
-
-#. module: account_usability
-#: model:ir.ui.menu,name:account_usability.menu_account_tax_template
-msgid "Tax Templates"
-msgstr "Modèle de taxe"
-
-#. module: account_usability
-#: model:ir.model.fields,field_description:account_usability.field_account_tax_group__tax_ids
-msgid "Taxes"
-msgstr "Taxes"
-
-#. module: account_usability
-#: model:ir.ui.menu,name:account_usability.menu_account_coa_settings
-msgid "Templates"
-msgstr "Modèle"
-
-#. module: account_usability
-#: model:ir.model.fields,field_description:account_usability.field_res_config_settings__anglo_saxon_accounting
-msgid "Use anglo-saxon accounting"
-msgstr ""
diff --git a/account_usability/readme/DESCRIPTION.rst b/account_usability/readme/DESCRIPTION.rst
index 04d963b2..d2cc5b2c 100644
--- a/account_usability/readme/DESCRIPTION.rst
+++ b/account_usability/readme/DESCRIPTION.rst
@@ -1,16 +1,26 @@
-This module adds all missing menu entries for the **Account** module.
+This module extends the Odoo CE account module to add all the missing or hidden things
+that are hidden and available only on EE version.
 
-* Account Types
-* Account Tags
-* Account Groups
-* Account Tax Groups
-* Bank Statements
-* Cash Registers
-* Chart of Account Templates
-* Account Templates
-* Tax Templates
-* Fiscal Position Templates
+1) This module adds all missing menu entries and views for the **Account** module.
 
-Additionally, this module also enables the option to enable or disable
-Anglo-Saxon accounting in the Chart of Account Template form view and
-in the Invoicing Settings.
+   * Bank Statements
+   * Cash Registers
+
+   * Account Tags
+   * Account Groups
+
+   * Chart of Account Templates
+   * Account Templates
+   * Tax Templates
+   * Fiscal Position Templates
+
+2) This module also enables the option to enable or disable
+   Anglo-Saxon accounting in the Chart of Account Template form view and
+   in the Invoicing Settings.
+
+3) In Odoo CE, the group 'Show Full Accounting Features' is hidden.
+   With that module, the group is selectable in the user form view.
+   Also the group "Billing / xxx" are renamed into "Accounting / yyy"
+   to fit with the EE terms.
+
+4) Rename the main menu 'Billing' into 'Accounting' to fit with EE naming.
diff --git a/account_usability/readme/ROADMAP.rst b/account_usability/readme/ROADMAP.rst
index 75a3b6c6..c401346d 100644
--- a/account_usability/readme/ROADMAP.rst
+++ b/account_usability/readme/ROADMAP.rst
@@ -1 +1,2 @@
-* Module renamed from account_menu to account_usability when migrating from v14.0 to v15.0 since there was a suggestion from previous migration
+* Add a form view for the model ``account.bank.statement`` as Odoo SA privatized in EE the form view
+  in V16.0.
diff --git a/account_usability/security/res_groups.xml b/account_usability/security/res_groups.xml
new file mode 100644
index 00000000..8a385632
--- /dev/null
+++ b/account_usability/security/res_groups.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+    Copyright (C) 2022-Today GRAP (http://www.grap.coop)
+    @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
+    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
+<odoo>
+    <!-- Rename groups to fit with EE naming
+    Previously named 'Show Accounting Features – Readonly' in CE ->
+    -->
+    <record id="account.group_account_readonly" model="res.groups">
+        <field name="name">Read-only</field>
+        <field name="category_id" ref="base.module_category_accounting_accounting" />
+    </record>
+
+    <!-- Rename groups to fit with EE naming
+    Previously named 'Show Full Accounting Features' in CE ->
+    -->
+    <record id="account.group_account_user" model="res.groups">
+        <field name="name">Bookkeeper</field>
+        <field name="category_id" ref="base.module_category_accounting_accounting" />
+    </record>
+
+    <!-- Rename groups to fit with EE naming
+    Previously named 'Billing Administrator' in CE ->
+    -->
+    <record id="account.group_account_manager" model="res.groups">
+        <field name="name">Accountant</field>
+        <field name="category_id" ref="base.module_category_accounting_accounting" />
+    </record>
+</odoo>
diff --git a/account_usability/views/menu.xml b/account_usability/views/menu.xml
index b5055d40..4296e0c1 100644
--- a/account_usability/views/menu.xml
+++ b/account_usability/views/menu.xml
@@ -5,6 +5,12 @@ Copyright (C) 2019 - Today: GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo>
+
+    <!-- Rename groups to fit with EE naming 'Billing' -> 'Accounting' -->
+    <record id="account.menu_finance" model="ir.ui.menu">
+        <field name="name">Accounting</field>
+    </record>
+
     <menuitem
         id="menu_accounting_bank_and_cash"
         name="Bank and Cash"
diff --git a/account_usability/views/view_account_account_template.xml b/account_usability/views/view_account_account_template.xml
index afea9d45..edf9c13b 100644
--- a/account_usability/views/view_account_account_template.xml
+++ b/account_usability/views/view_account_account_template.xml
@@ -1,11 +1,83 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 Copyright (C) 2019 - Today: GRAP (http://www.grap.coop)
+Copyright (C) 2021 - Today: Odoo SA
 @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo>
 
+        <record id="view_account_account_template_form" model="ir.ui.view">
+            <field name="model">account.account.template</field>
+            <field name="arch" type="xml">
+                <form>
+                    <group col="4">
+                        <field name="name" />
+                        <field name="code" />
+                        <newline />
+                        <field
+                        name="account_type"
+                        widget="account_hierarchy_selection"
+                    />
+                        <field
+                        name="currency_id"
+                        options="{'no_create': True}"
+                        groups="base.group_multi_currency"
+                    />
+                        <field
+                        name="tag_ids"
+                        domain="[('applicability', '=', 'accounts')]"
+                        widget="many2many_tags"
+                        context="{'default_applicability': 'accounts'}"
+                    />
+                        <field name="reconcile" />
+                        <field name="nocreate" />
+                        <field name="chart_template_id" />
+                    </group>
+                    <separator string="Default Taxes" />
+                    <field name="tax_ids" />
+                    <separator string="Notes" />
+                    <field name="note" placeholder="Internal notes..." />
+                </form>
+            </field>
+        </record>
+
+        <record id="view_account_account_template_tree" model="ir.ui.view">
+            <field name="model">account.account.template</field>
+            <field name="arch" type="xml">
+                <tree decoration-muted="(nocreate)">
+                    <field name="code" />
+                    <field name="name" />
+                    <field name="account_type" />
+                    <field name="nocreate" invisible="1" />
+                    <field name="chart_template_id" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_account_account_template_search" model="ir.ui.view">
+            <field name="name">account.account.template.search</field>
+            <field name="model">account.account.template</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field
+                    name="name"
+                    filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+                    string="Account Template"
+                />
+                    <field name="account_type" />
+                    <group expand="0" string="Group By">
+                        <filter
+                        string="Account Type"
+                        name="accounttype"
+                        domain="[]"
+                        context="{'group_by':'account_type'}"
+                    />
+                   </group>
+                </search>
+            </field>
+        </record>
+
     <record id="account_account_template_action" model="ir.actions.act_window">
         <field name="name">Account Templates</field>
         <field name="res_model">account.account.template</field>
diff --git a/account_usability/views/view_account_chart_template.xml b/account_usability/views/view_account_chart_template.xml
index 580cd396..ed6c3dcd 100644
--- a/account_usability/views/view_account_chart_template.xml
+++ b/account_usability/views/view_account_chart_template.xml
@@ -1,23 +1,104 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 Copyright (C) 2019 - Today: GRAP (http://www.grap.coop)
+Copyright (C) 2021 - Today: Odoo SA
 @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo>
+
     <record id="view_account_chart_template_form" model="ir.ui.view">
         <field name="model">account.chart.template</field>
-        <field name="inherit_id" ref="account.view_account_chart_template_form" />
         <field name="arch" type="xml">
-            <field name="complete_tax_set" position="after">
-                <field name="use_anglo_saxon" />
-            </field>
+            <form>
+                <group col="4">
+                    <field name="name" />
+                    <field name="parent_id" />
+                    <field name="bank_account_code_prefix" />
+                    <field name="cash_account_code_prefix" />
+                    <field name="transfer_account_code_prefix" />
+                    <field name="code_digits" />
+                    <field name="visible" />
+                    <field name="use_storno_accounting" />
+                </group>
+                <separator string="Default Taxes" colspan="4" />
+                <field name="tax_template_ids" colspan="4" nolabel="1" />
+                <separator string="Properties" colspan="4" />
+                <group col="4">
+                    <field name="property_account_receivable_id" />
+                    <field name="property_account_payable_id" />
+                    <field name="property_account_expense_categ_id" />
+                    <field name="property_account_income_categ_id" />
+                    <field name="property_account_expense_id" />
+                    <field name="property_account_income_id" />
+                    <field name="account_journal_early_pay_discount_loss_account_id" />
+                    <field name="account_journal_early_pay_discount_gain_account_id" />
+                </group>
+            </form>
         </field>
     </record>
 
+    <record id="view_account_chart_template_tree" model="ir.ui.view">
+        <field name="model">account.chart.template</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+                <field name="property_account_receivable_id" invisible="1" />
+                <field name="property_account_payable_id" invisible="1" />
+                <field name="property_account_expense_categ_id" invisible="1" />
+                <field name="property_account_income_categ_id" invisible="1" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_account_chart_template_seacrh" model="ir.ui.view">
+        <field name="model">account.chart.template</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name" string="Account Template" />
+                <field name="bank_account_code_prefix" />
+                <field name="cash_account_code_prefix" />
+                <field name="transfer_account_code_prefix" />
+                <group expand="0" string="Group By">
+                    <filter
+                        string="Receivable Account"
+                        name="receivalbeacc"
+                        domain="[]"
+                        context="{'group_by':'property_account_receivable_id'}"
+                    />
+                    <filter
+                        string="Payable Account"
+                        name="payableacc"
+                        domain="[]"
+                        context="{'group_by':'property_account_payable_id'}"
+                    />
+                    <filter
+                        string="Income Account"
+                        name="incomeacc"
+                        domain="[]"
+                        context="{'group_by':'property_account_income_categ_id'}"
+                    />
+                    <filter
+                        string="Expense Account"
+                        name="expenseacc"
+                        domain="[]"
+                        context="{'group_by':'property_account_expense_categ_id'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+
+
+    <record id="action_account_chart_template_form" model="ir.actions.act_window">
+        <field name="name">Chart of Accounts Templates</field>
+        <field name="res_model">account.chart.template</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
     <menuitem
         id="menu_account_chart_template"
-        action="account.action_account_chart_template_form"
+        action="action_account_chart_template_form"
         parent="menu_account_coa_settings"
         sequence="10"
     />
diff --git a/account_usability/views/view_account_fiscal_position_template.xml b/account_usability/views/view_account_fiscal_position_template.xml
index 0fb859bc..397aa4d4 100644
--- a/account_usability/views/view_account_fiscal_position_template.xml
+++ b/account_usability/views/view_account_fiscal_position_template.xml
@@ -5,6 +5,42 @@ Copyright (C) 2019 - Today: GRAP (http://www.grap.coop)
 License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo>
+
+    <record id="view_account_fiscal_position_template_tree" model="ir.ui.view">
+        <field name="model">account.fiscal.position.template</field>
+        <field name="inherit_id" ref="account.view_account_position_template_tree" />
+        <field name="arch" type="xml">
+            <field name="name" position="before">
+                <field name="sequence" widget="handle" />
+            </field>
+            <field name="name" position="after">
+                <field name="chart_template_id" />
+            </field>
+        </field>
+    </record>
+
+
+    <record id="view_account_fiscal_position_template_form" model="ir.ui.view">
+        <field name="model">account.fiscal.position.template</field>
+        <field name="inherit_id" ref="account.view_account_position_template_form" />
+        <field name="arch" type="xml">
+            <field name="account_ids" position="after">
+                <group string="Extra configuration" col="4">
+                    <field name="auto_apply" />
+                    <field name="vat_required" />
+                    <field name="country_id" />
+                    <field name="country_group_id" />
+                    <field name="state_ids" widget="many2many_tags" />
+                    <field name="zip_from" />
+                    <field name="zip_to" />
+                </group>
+                <group string="Note">
+                    <field name="note" nolabel="1" colspan="4" />
+                </group>
+            </field>
+        </field>
+    </record>
+
     <record id="account_fiscal_position_template_action" model="ir.actions.act_window">
             <field name="name">Fiscal Position Templates</field>
             <field name="res_model">account.fiscal.position.template</field>
diff --git a/account_usability/views/view_account_group.xml b/account_usability/views/view_account_group.xml
index 54c79568..29592e90 100644
--- a/account_usability/views/view_account_group.xml
+++ b/account_usability/views/view_account_group.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="view_account_group_form" model="ir.ui.view">
-        <field name="name">account.group.form</field>
         <field name="model">account.group</field>
         <field name="inherit_id" ref="account.view_account_group_form" />
         <field name="arch" type="xml">
             <xpath expr="//group" position="after">
-                <group>
-                    <group id="links">
-                        <label for="account_ids" />
-                        <field
-                            name="account_ids"
-                            widget="many2many"
-                            nolabel="1"
-                            options="{'no_create_edit': True}"
-                        />
-                    </group>
+                <group id="links" string="Accounts">
+                    <field
+                        name="account_ids"
+                        widget="many2many_tags"
+                        nolabel="1"
+                        options="{'no_create_edit': True}"
+                        colspan="2"
+                    />
                 </group>
             </xpath>
         </field>
diff --git a/account_usability/views/view_account_tag.xml b/account_usability/views/view_account_tag.xml
index 120e9c0b..210ce083 100644
--- a/account_usability/views/view_account_tag.xml
+++ b/account_usability/views/view_account_tag.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="account_tag_view_form" model="ir.ui.view">
-        <field name="name">tag_addd_accounts_taxes</field>
         <field name="model">account.account.tag</field>
         <field name="inherit_id" ref="account.account_tag_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//group" position="after">
-                <group>
-                    <group id="applicability">
-                        <field name="applicability" widget="selection" />
-                    </group>
-                </group>
                 <group>
                     <group id="links">
                         <label
diff --git a/account_usability/views/view_account_tax_group.xml b/account_usability/views/view_account_tax_group.xml
deleted file mode 100644
index 2bef40ff..00000000
--- a/account_usability/views/view_account_tax_group.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <record id="view_account_tax_group_form" model="ir.ui.view">
-        <field name="name">account.tax.group.form</field>
-        <field name="model">account.tax.group</field>
-        <field name="arch" type="xml">
-            <form string="Account Tax Group">
-                <group>
-                    <group id="name">
-                        <field name="name" />
-                    </group>
-                </group>
-                <group>
-                    <group id="sequence">
-                        <field name="sequence" />
-                    </group>
-                </group>
-                <group>
-                    <group id="links">
-                        <label for="tax_ids" />
-                        <field
-                            name="tax_ids"
-                            widget="one2many_list"
-                            colspan="4"
-                            nolabel="1"
-                            mode="tree"
-                            options="{'no_create_edit': True}"
-                        />
-                    </group>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record id="view_account_tax_group_search" model="ir.ui.view">
-        <field name="name">account.tax.group.search</field>
-        <field name="model">account.tax.group</field>
-        <field name="arch" type="xml">
-            <search string="Account Tax Groups">
-                <field
-                    name="name"
-                    filter_domain="['|', ('sequence', '=like', str(self) + '%'), ('name', 'ilike', self)]"
-                    string="Account Tax Group"
-                />
-            </search>
-        </field>
-    </record>
-    <record id="view_account_tax_group_tree" model="ir.ui.view">
-        <field name="name">account.tax.group.tree</field>
-        <field name="model">account.tax.group</field>
-        <field name="arch" type="xml">
-            <tree name="account_tax_group">
-                <field name="sequence" />
-                <field name="name" />
-            </tree>
-        </field>
-    </record>
-    <record id="action_account_tax_group" model="ir.actions.act_window">
-        <field name="name">Account Tax Groups</field>
-        <field name="res_model">account.tax.group</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-    <menuitem
-        id="account_tax_group_menu"
-        action="action_account_tax_group"
-        sequence="51"
-        parent="account.account_account_menu"
-    />
-</odoo>
diff --git a/account_usability/views/view_account_type.xml b/account_usability/views/view_account_type.xml
deleted file mode 100644
index ad1be47b..00000000
--- a/account_usability/views/view_account_type.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <menuitem
-        id="account_type_menu"
-        action="account.action_account_type_form"
-        sequence="30"
-        parent="account.account_account_menu"
-    />
-</odoo>
diff --git a/setup/account_usability/odoo/addons/account_usability b/setup/account_usability/odoo/addons/account_usability
new file mode 120000
index 00000000..547769b8
--- /dev/null
+++ b/setup/account_usability/odoo/addons/account_usability
@@ -0,0 +1 @@
+../../../../account_usability
\ No newline at end of file
diff --git a/setup/account_usability/setup.py b/setup/account_usability/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/account_usability/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)