diff --git a/account_chart_update/i18n/account_chart_update.pot b/account_chart_update/i18n/account_chart_update.pot
index 882c57d36..f6bb3a51e 100644
--- a/account_chart_update/i18n/account_chart_update.pot
+++ b/account_chart_update/i18n/account_chart_update.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -14,22 +14,27 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_code_digits
-msgid "# of digits"
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__code_digits
+msgid "# of Digits"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Update Chart Template</span>"
+msgstr ""
+
+#. module: account_chart_update
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "<span states=\"init,ready\"> or </span>"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_field_ids
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__account_field_ids
 msgid "Account fields"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_account_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__account_id
 msgid "Account template"
 msgstr ""
 
@@ -39,38 +44,43 @@ msgid "Account that needs to be updated (new or updated in the template)."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_update_account_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__update_account_id
 msgid "Account to update"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_ids
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__account_ids
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Accounts"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_chart_template_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__account_matching_ids
+msgid "Accounts matching"
+msgstr ""
+
+#. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__chart_template_id
 msgid "Chart Template"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_chart_template_ids
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__chart_template_ids
 msgid "Chart Templates"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Close"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_company_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__company_id
 msgid "Company"
 msgstr ""
 
@@ -80,120 +90,120 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_continue_on_errors
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__continue_on_errors
 msgid "Continue on errors"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Create/Update"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:838
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:822
 #, python-format
 msgid "Created account %s."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_create_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_create_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_create_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_create_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_create_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_create_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_create_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching__create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching__create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching__create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching__create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:943
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:927
 #, python-format
 msgid "Created fiscal position %s."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_create_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_create_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_create_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_create_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_create_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_create_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_create_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching__create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching__create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching__create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching__create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:801
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:785
 #, python-format
 msgid "Created tax %s."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:796
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:780
 #, python-format
 msgid "Deactivated tax %s."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_deleted_taxes
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__deleted_taxes
 msgid "Deactivated taxes"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_tax_type_tax_use
-msgid "Determines where the tax is selectable. Note : 'None' means a tax can't be used by itself, however it can still be used in a group."
+#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_tax__type_tax_use
+msgid "Determines where the tax is selectable. Note : 'None' means a tax can't be used by itself, however it can still be used in a group. 'adjustment' is used to perform tax adjustment."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:631
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:615
 #, python-format
 msgid "Differences in these fields: %s."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_display_name
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_display_name
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_display_name
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_display_name
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_display_name
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_display_name
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_display_name
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching__display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching__display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching__display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching__display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:847
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:831
 #, python-format
 msgid "Exception creating account %s."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:877
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:861
 #, python-format
 msgid "Exception writing account %s."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_update_account
+#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts__update_account
 msgid "Existing accounts are updated. Accounts are searched by code."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_update_fiscal_position
+#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts__update_fiscal_position
 msgid "Existing fiscal positions are updated. Fiscal positions are searched by name."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_update_tax
+#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts__update_tax
 msgid "Existing taxes are updated. Taxes are searched by name."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Field options"
 msgstr ""
 
@@ -203,12 +213,12 @@ msgid "Fields"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fp_field_ids
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__fp_field_ids
 msgid "Fiscal position fields"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_fiscal_position_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__fiscal_position_id
 msgid "Fiscal position template"
 msgstr ""
 
@@ -218,153 +228,161 @@ msgid "Fiscal position that needs to be updated (new or updated in the template)
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_update_fiscal_position_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__update_fiscal_position_id
 msgid "Fiscal position to update"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_ids
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__fiscal_position_ids
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Fiscal positions"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_lang
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__fp_matching_ids
+msgid "Fiscal positions matching"
+msgstr ""
+
+#. module: account_chart_update
+#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts__lang
 msgid "For records searched by name (taxes, fiscal positions), the template name will be matched against the record name on this language."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "General options"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
-msgid "Here you can select the fields you want to check if they have been updated in the templates."
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+msgid "Here you can select the fields you want to check if\n"
+"                            they have been updated in the templates."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Here you can set the matching order."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching__id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching__id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching__id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching__id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__id
 msgid "ID"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_continue_on_errors
+#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts__continue_on_errors
 msgid "If set, the wizard will continue to the next step even if there are minor errors."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
-msgid "If you leave these options set, the wizard will not just create new records, but also update records with changes (i.e. different tax amount)"
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+msgid "If you leave these options set, the wizard will\n"
+"                                not just create new records, but also update\n"
+"                                records with changes (i.e. different tax amount)"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_chart_template_ids
+#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts__chart_template_ids
 msgid "Includes all chart templates."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_lang
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__lang
 msgid "Language"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching___last_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching___last_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching___last_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching___last_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts___last_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account___last_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position___last_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax___last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching____last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching____last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching____last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching____last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts____last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account____last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position____last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_write_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_write_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_write_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_write_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_write_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_write_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_write_uid
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching__write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching__write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching__write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching__write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_write_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_write_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_write_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_write_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_write_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_write_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_write_date
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching__write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching__write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching__write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching__write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Log"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Matching"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_matching_value
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_matching_value
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_matching_value
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_matching_value
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching__matching_value
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching__matching_value
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching__matching_value
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching__matching_value
 msgid "Matching Value"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_log
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__log
 msgid "Messages and Errors"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:671
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:717
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:755
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:655
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:701
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:739
 #, python-format
 msgid "Missing XML-ID."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:662
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:646
 #, python-format
 msgid "Name or description not found."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_new_accounts
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__new_accounts
 msgid "New accounts"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_new_fps
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__new_fps
 msgid "New fiscal positions"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_new_taxes
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__new_taxes
 msgid "New taxes"
 msgstr ""
 
@@ -376,41 +394,41 @@ msgid "New template"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Next"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:709
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:693
 #, python-format
 msgid "No account found with this code."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:747
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:731
 #, python-format
 msgid "No fiscal position found with this name."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_code_digits
-msgid "No. of digits to use for account code. Make sure it is the same number as existing accounts."
+#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts__code_digits
+msgid "No. of Digits to use for account code"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Note: Only the changed fields are updated."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_notes
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_notes
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_notes
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__notes
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__notes
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__notes
 msgid "Notes"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:349
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:333
 #, python-format
 msgid "One or more errors detected!\n"
 "\n"
@@ -418,38 +436,38 @@ msgid "One or more errors detected!\n"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Other options"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:900
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:884
 #, python-format
 msgid "Post-updated tax %s."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Previous"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Records to create/update"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_recreate_xml_ids
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__recreate_xml_ids
 msgid "Recreate missing XML-IDs"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_rejected_new_account_number
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__rejected_new_account_number
 msgid "Rejected New Account Number"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_rejected_updated_account_number
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__rejected_updated_account_number
 msgid "Rejected Updated Account Number"
 msgstr ""
 
@@ -459,46 +477,46 @@ msgid "Select records to update"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_sequence
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_sequence
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_sequence
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_sequence
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching__sequence
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching__sequence
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching__sequence
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_state
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__state
 msgid "Status"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Summary of created objects"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Summary of updated objects"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_type_tax_use
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__type_tax_use
 msgid "Tax Scope"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_field_ids
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__tax_field_ids
 msgid "Tax fields"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:636
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:620
 #, python-format
 msgid "Tax is disabled."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_tax_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__tax_id
 msgid "Tax template"
 msgstr ""
 
@@ -513,53 +531,53 @@ msgid "Tax to deactivate"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_update_tax_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__update_tax_id
 msgid "Tax to update"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_ids
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__tax_ids
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Taxes"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_matching_ids
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fp_matching_ids
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_matching_ids
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__tax_matching_ids
 msgid "Taxes matching"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
-msgid "This wizard will update your accounts, taxes and fiscal positions according to the selected chart template"
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+msgid "This wizard will update your accounts, taxes and\n"
+"                            fiscal positions according to the selected chart\n"
+"                            template"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:693
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:677
 #, python-format
 msgid "To deactivate: not in the template"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_type
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_type
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_type
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__type
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__type
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__type
 msgid "Type"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_res_config_settings
+#: model_terms:ir.ui.view,arch_db:account_chart_update.res_config_settings_view_form
 msgid "Update Chart Template"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_res_config_settings
+#: model_terms:ir.ui.view,arch_db:account_chart_update.res_config_settings_view_form
 msgid "Update Taxes, fiscal positions or chart of accounts."
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_update_account
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__update_account
 msgid "Update accounts"
 msgstr ""
 
@@ -569,84 +587,84 @@ msgid "Update chart of accounts"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_res_config_settings
+#: model_terms:ir.ui.view,arch_db:account_chart_update.res_config_settings_view_form
 msgid "Update chart template"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_update_chart_wizard_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_update_chart_wizard_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_update_chart_wizard_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_update_chart_wizard_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_update_chart_wizard_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_update_chart_wizard_id
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_update_chart_wizard_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching__update_chart_wizard_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching__update_chart_wizard_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching__update_chart_wizard_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching__update_chart_wizard_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account__update_chart_wizard_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position__update_chart_wizard_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax__update_chart_wizard_id
 msgid "Update chart wizard"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_update_fiscal_position
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__update_fiscal_position
 msgid "Update fiscal positions"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "Update records?"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_update_tax
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__update_tax
 msgid "Update taxes"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:860
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:844
 #, python-format
 msgid "Updated account %s."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:867
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:851
 #, python-format
 msgid "Updated account %s. (Recreated XML-ID)"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_updated_accounts
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__updated_accounts
 msgid "Updated accounts"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:949
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:933
 #, python-format
 msgid "Updated fiscal position %s."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:955
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:939
 #, python-format
 msgid "Updated fiscal position %s. (Recreated XML-ID)"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_updated_fps
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__updated_fps
 msgid "Updated fiscal positions"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:809
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:793
 #, python-format
 msgid "Updated tax %s."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:812
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:796
 #, python-format
 msgid "Updated tax %s. (Recreated XML-IDs)"
 msgstr ""
 
 #. module: account_chart_update
-#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_updated_taxes
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts__updated_taxes
 msgid "Updated taxes"
 msgstr ""
 
@@ -657,6 +675,16 @@ msgstr ""
 msgid "Updated template"
 msgstr ""
 
+#. module: account_chart_update
+#: model:ir.model,name:account_chart_update.model_wizard_matching
+msgid "Wizard Matching"
+msgstr ""
+
+#. module: account_chart_update
+#: model:ir.model,name:account_chart_update.model_wizard_update_charts_accounts
+msgid "Wizard Update Charts Accounts"
+msgstr ""
+
 #. module: account_chart_update
 #: selection:wizard.update.charts.accounts,state:0
 msgid "Wizard completed"
@@ -672,18 +700,8 @@ msgstr ""
 msgid "wizard.fp.matching"
 msgstr ""
 
-#. module: account_chart_update
-#: model:ir.model,name:account_chart_update.model_wizard_matching
-msgid "wizard.matching"
-msgstr ""
-
 #. module: account_chart_update
 #: model:ir.model,name:account_chart_update.model_wizard_tax_matching
 msgid "wizard.tax.matching"
 msgstr ""
 
-#. module: account_chart_update
-#: model:ir.model,name:account_chart_update.model_wizard_update_charts_accounts
-msgid "wizard.update.charts.accounts"
-msgstr ""
-