diff --git a/account_chart_update/i18n/am.po b/account_chart_update/i18n/am.po
index 997a374dc..0dc4b70aa 100644
--- a/account_chart_update/i18n/am.po
+++ b/account_chart_update/i18n/am.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 ""
 
@@ -44,38 +49,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 ""
 
@@ -85,123 +95,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Última actualización por"
 
 #. 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 "Última actualización en"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/ar.po b/account_chart_update/i18n/ar.po
index 2c88e7a0d..6cb3efdaa 100644
--- a/account_chart_update/i18n/ar.po
+++ b/account_chart_update/i18n/ar.po
@@ -20,22 +20,27 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\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 ""
 
@@ -45,38 +50,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 "الشركة"
 
@@ -86,123 +96,124 @@ 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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
+#: model_terms: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)"
+"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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/bg.po b/account_chart_update/i18n/bg.po
index 2206020eb..eb1b1d3d3 100644
--- a/account_chart_update/i18n/bg.po
+++ b/account_chart_update/i18n/bg.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 "Фирма"
 
@@ -85,123 +95,124 @@ 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/bs.po b/account_chart_update/i18n/bs.po
index 572676c90..3e1440b16 100644
--- a/account_chart_update/i18n/bs.po
+++ b/account_chart_update/i18n/bs.po
@@ -20,22 +20,27 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 ""
 
@@ -45,38 +50,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 "Kompanija"
 
@@ -86,123 +96,124 @@ 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 "Kreirao"
 
 #. 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 "Kreirano"
 
 #. 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
+#: 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."
+"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 "Prikaži naziv"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Zadnje mijenjano"
 
 #. 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 "Zadnji ažurirao"
 
 #. 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 "Zadnje ažurirano"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 "Status"
 
 #. 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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Vrsta"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/ca.po b/account_chart_update/i18n/ca.po
index bc18039c2..600b995d6 100644
--- a/account_chart_update/i18n/ca.po
+++ b/account_chart_update/i18n/ca.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 "Companyia"
 
@@ -85,123 +95,124 @@ 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 "Creat per"
 
 #. 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 "Creat el"
 
 #. 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
+#: 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."
+"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 "Veure el nom"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Darrera modificació el"
 
 #. 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 "Darrera Actualització per"
 
 #. 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 "Darrera Actualització el"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 "Estat"
 
 #. 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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Tipus"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/ca_ES.po b/account_chart_update/i18n/ca_ES.po
index 8f2f2f9da..56f172a47 100644
--- a/account_chart_update/i18n/ca_ES.po
+++ b/account_chart_update/i18n/ca_ES.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 "Companyia"
 
@@ -86,123 +96,124 @@ 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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
+#: model_terms: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)"
+"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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 "Estat"
 
 #. 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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/cs.po b/account_chart_update/i18n/cs.po
index 88582180b..739492e33 100644
--- a/account_chart_update/i18n/cs.po
+++ b/account_chart_update/i18n/cs.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 ""
 
@@ -44,38 +49,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 "Společnost"
 
@@ -85,123 +95,124 @@ 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 "Vytvořil(a)"
 
 #. 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 "Vytvořeno"
 
 #. 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
+#: 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."
+"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 "Zobrazovaný název"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Naposled upraveno"
 
 #. 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 "Naposled upraveno"
 
 #. 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 "Naposled upraveno"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Druh"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/da.po b/account_chart_update/i18n/da.po
index 1791c7048..3cbf76d3e 100644
--- a/account_chart_update/i18n/da.po
+++ b/account_chart_update/i18n/da.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 ""
 
@@ -85,123 +95,124 @@ 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 "Oprettet af"
 
 #. 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 "Oprettet den"
 
 #. 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
+#: 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."
+"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 "Vist navn"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "Id"
 
 #. 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
+#: model_terms: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)"
+"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 "Sidst ændret den"
 
 #. 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 "Sidst opdateret af"
 
 #. 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 "Sidst opdateret den"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Type"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/de.po b/account_chart_update/i18n/de.po
index b445e1cab..1963104b1 100644
--- a/account_chart_update/i18n/de.po
+++ b/account_chart_update/i18n/de.po
@@ -21,22 +21,29 @@ msgstr ""
 "X-Generator: Weblate 3.4\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
+#, fuzzy
+#| msgid "# of digits"
+msgid "# of Digits"
 msgstr "Ziffernanzahl"
 
 #. 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 "<span states=\"init,ready\"> oder </span>"
 
 #. 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 "Konten Felder"
 
 #. 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 "Kontenvorlage"
 
@@ -47,38 +54,45 @@ msgstr ""
 "Konto, welches aktualisiert werden muss (neu oder gem. Vorlage aktualisiert)"
 
 #. 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 "Zu aktualisierendes Konto"
 
 #. 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 "Konten"
 
 #. 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
+#, fuzzy
+#| msgid "Account template"
+msgid "Accounts matching"
+msgstr "Kontenvorlage"
+
+#. 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 "Kontenrahmenvorlage"
 
 #. 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 "Kontenrahmenvorlagen"
 
 #. 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 "Kontenrahmen"
 
 #. 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 "Schliessen"
 
 #. 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 "Unternehmen"
 
@@ -88,116 +102,121 @@ msgid "Configuration"
 msgstr "Konfiguration"
 
 #. 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 "Bei Fehlern fortfahren"
 
 #. 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 "Anlegen/Aktualisieren"
 
 #. 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 "Konto %s angelegt."
 
 #. 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 "Erstellt von"
 
 #. 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
 #, fuzzy, python-format
 msgid "Created fiscal position %s."
 msgstr "Steuerkontierung %s angelegt bzw. aktualisiert."
 
 #. 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 "Erstellt am"
 
 #. 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 "Steuer %s angelegt."
 
 #. 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 "Steuer %s deaktiviert."
 
 #. 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 "Deaktivierte Steuern"
 
 #. module: account_chart_update
-#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_tax_type_tax_use
+#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_tax__type_tax_use
+#, fuzzy
+#| 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."
 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."
+"used by itself, however it can still be used in a group. 'adjustment' is "
+"used to perform tax adjustment."
 msgstr ""
 "Bestimmt, wo die Steuer ausgewählt werden kann. Hinweis: 'Nie' bedeutet, "
 "dass eine Steuer nicht selbständig ausgewählt werden kann, sie aber sehr "
 "wohl noch in einer Gruppe eingesetzt werden kann."
 
 #. 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 "Unterschiede in diesen Feldern: %s."
 
 #. 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 "Anzeigename"
 
 #. 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 "Fehler bei Anlage von Konto %s."
 
 #. 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 "Fehler bei Speichern von Konto %s."
 
 #. 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 ""
 "Bestehende Konten sind aktualisiert. Konten wurden nach Schlüssel gesucht."
 
 #. 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 ""
@@ -205,14 +224,14 @@ msgstr ""
 "Bezeichnung gesucht."
 
 #. 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 ""
 "Bestehende Steuern wurden aktualisiert. Steuern wurden nach Bezeichnung "
 "gesucht."
 
 #. 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 "Optionale Feldauswahl"
 
@@ -222,12 +241,12 @@ msgid "Fields"
 msgstr "Felder"
 
 #. 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 "Steuerzuordnungen Felder"
 
 #. 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 "Steuerzuordnungsvorlage"
 
@@ -239,18 +258,25 @@ msgstr ""
 "Steuerzuordnung muss aktualisiert werden (neu oder aus Vorlage aktualisiert)"
 
 #. 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 "Zu aktualisierende Steuerzuordnung"
 
 #. 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 "Steuerzuordnungen"
 
 #. 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
+#, fuzzy
+#| msgid "Fiscal positions"
+msgid "Fiscal positions matching"
+msgstr "Steuerzuordnungen"
+
+#. 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."
@@ -259,38 +285,42 @@ msgstr ""
 "wir die Vorlagenbezeichnung gegen den Satznamen in dieser Sprache verglichen."
 
 #. 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 "Optionale Einstellungen"
 
 #. 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
+#, fuzzy
+#| msgid ""
+#| "Here you can select the fields you want to check if they have been "
+#| "updated in the templates."
 msgid ""
-"Here you can select the fields you want to check if they have been updated "
-"in the templates."
+"Here you can select the fields you want to check if\n"
+"                            they have been updated in the templates."
 msgstr ""
 "Hier können Sie die Felder auswählen, für die Sie prüfen wollen, ob es eine "
 "Aktualisierung in der Vorlage gibt."
 
 #. 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 "ID"
 
 #. 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."
@@ -299,110 +329,117 @@ msgstr ""
 "nächsten Schritt fort."
 
 #. 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
+#, fuzzy
+#| 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)"
 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)"
+"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 ""
 "Wenn Sie diese Option gesetzt lassen, erstellt der Assistent nicht nur neue "
 "Datensätze, sondern aktualisiert auch geänderte (z. B. bei abweichendem "
 "Steuersatz)"
 
 #. 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 "Schließt alle Kontenrahmenvorlagen ein."
 
 #. 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 "Sprache"
 
 #. 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 "Zuletzt geändert am"
 
 #. 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 "Zuletzt geändert von"
 
 #. 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 "Zuletzt geändert am"
 
 #. 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 "Log"
 
 #. 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 "Meldungen und Fehler"
 
 #. 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 "Bezeichnung oder Beschreibung nicht gefunden."
 
 #. 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 "Neue Konten"
 
 #. 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 "Neue Steuerzuordnungen"
 
 #. 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 "Neue  Steuern"
 
@@ -414,45 +451,41 @@ msgid "New template"
 msgstr "Neue Vorlage"
 
 #. 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 "Nächster"
 
 #. 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 "Kein Konto mit diesem Schlüssel gefunden."
 
 #. 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 "Keine Steuerzuordnung mit dieser Bezeichnung gefunden."
 
 #. 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 ""
-"Anzahl Ziffern, die für die Kontenschlüssel verwendet werden. Stellen Sie "
-"bitte sicher, die gleiche Anzahl wie bestehende Konten zu verwenden."
 
 #. 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 "Hinweis: Nur geänderte Felder werden aktualisiert."
 
 #. 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 "Hinweise"
 
 #. 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"
@@ -464,38 +497,38 @@ msgstr ""
 "%s"
 
 #. 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 "Andere Optionen"
 
 #. 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 "Steuer %s aktualisiert."
 
 #. 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 "Voriger"
 
 #. 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 "Zu aktualisierende Datensätze"
 
 #. 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 "Verworfene neue Kontonummer"
 
 #. 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 "Verworfene neue Kontonummer"
 
@@ -505,46 +538,46 @@ msgid "Select records to update"
 msgstr "Wählen Sie zu aktualisierende Datensätze"
 
 #. 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 "Status"
 
 #. 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 "Zusammenfassung erstellter Objekte"
 
 #. 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 "Zusammenfassung aktualisierter Objekte"
 
 #. 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 "Steuerumfang"
 
 #. 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 "Steuer Felder"
 
 #. 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 "Steuer ist ausgeschaltet."
 
 #. 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 "Steuervorlage"
 
@@ -560,57 +593,61 @@ msgid "Tax to deactivate"
 msgstr "Zu deaktivierende Steuer"
 
 #. 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 "Zu aktualisierende Steuer"
 
 #. 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 "Steuern"
 
 #. 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
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#, fuzzy
+#| msgid ""
+#| "This wizard will update your accounts, taxes and fiscal positions "
+#| "according to the selected chart template"
 msgid ""
-"This wizard will update your accounts, taxes and fiscal positions according "
-"to the selected chart template"
+"This wizard will update your accounts, taxes and\n"
+"                            fiscal positions according to the selected "
+"chart\n"
+"                            template"
 msgstr ""
 "Dieser Assistent aktualisiert Ihre Konten, Steuern und Steuerzuordnungen "
 "gemäß ausgewählter Kontenrahmenvorlage"
 
 #. 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 "Zu deaktivieren: Nicht in Vorlage"
 
 #. 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 "Art"
 
 #. 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 "Aktualisiere Kontenplan"
 
 #. 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 "Aktualisiere Steuern, Steuerzuordnung oder Kontenplan."
 
 #. 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 "Aktualisiere Konten"
 
@@ -620,84 +657,84 @@ msgid "Update chart of accounts"
 msgstr "Aktualisiere Kontenrahmen"
 
 #. 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 "Aktualisiere Kontenrahmenvorlage"
 
 #. 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 "Assistent für Kontenrahmenaktualisierung"
 
 #. 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 "Aktualisiere Steuerzuordnungen"
 
 #. 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 "Datensätze aktualisieren?"
 
 #. 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 "Steuern aktualisieren"
 
 #. 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 "Konto %saktualisieren ."
 
 #. 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
 #, fuzzy, python-format
 msgid "Updated account %s. (Recreated XML-ID)"
 msgstr "Konto %saktualisieren ."
 
 #. 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 "Aktualisierte Konten"
 
 #. 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
 #, fuzzy, python-format
 msgid "Updated fiscal position %s."
 msgstr "Aktualisierte Steuerzuordnungen"
 
 #. 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
 #, fuzzy, python-format
 msgid "Updated fiscal position %s. (Recreated XML-ID)"
 msgstr "Aktualisierte Steuerzuordnungen"
 
 #. 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 "Aktualisierte Steuerzuordnungen"
 
 #. 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 "Steuer %s aktualisiert."
 
 #. 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
 #, fuzzy, python-format
 msgid "Updated tax %s. (Recreated XML-IDs)"
 msgstr "Steuer %s aktualisiert."
 
 #. 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 "Steuern aktualisiert"
 
@@ -708,6 +745,18 @@ msgstr "Steuern aktualisiert"
 msgid "Updated template"
 msgstr "Vorlage aktualisiert"
 
+#. 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
+#, fuzzy
+#| msgid "wizard.update.charts.accounts"
+msgid "Wizard Update Charts Accounts"
+msgstr "wizard.update.charts.accounts"
+
 #. module: account_chart_update
 #: selection:wizard.update.charts.accounts,state:0
 msgid "Wizard completed"
@@ -723,17 +772,14 @@ 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 "wizard.update.charts.accounts"
+#~ msgid ""
+#~ "No. of digits to use for account code. Make sure it is the same number as "
+#~ "existing accounts."
+#~ msgstr ""
+#~ "Anzahl Ziffern, die für die Kontenschlüssel verwendet werden. Stellen Sie "
+#~ "bitte sicher, die gleiche Anzahl wie bestehende Konten zu verwenden."
diff --git a/account_chart_update/i18n/el_GR.po b/account_chart_update/i18n/el_GR.po
index 472e4c193..42da3e8dc 100644
--- a/account_chart_update/i18n/el_GR.po
+++ b/account_chart_update/i18n/el_GR.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 "Εταιρεία"
 
@@ -86,123 +96,124 @@ 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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
+#: model_terms: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)"
+"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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/en_GB.po b/account_chart_update/i18n/en_GB.po
index 0786bd534..0725009c7 100644
--- a/account_chart_update/i18n/en_GB.po
+++ b/account_chart_update/i18n/en_GB.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 "Company"
 
@@ -86,123 +96,124 @@ 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 "Created by"
 
 #. 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 "Created on"
 
 #. 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
+#: 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."
+"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 "Display Name"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Last Modified on"
 
 #. 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 "Last Updated by"
 
 #. 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 "Last Updated on"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 "Status"
 
 #. 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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Type"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es.po b/account_chart_update/i18n/es.po
index 34aba182b..3f914897c 100644
--- a/account_chart_update/i18n/es.po
+++ b/account_chart_update/i18n/es.po
@@ -17,23 +17,30 @@ 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
+#, fuzzy
+#| msgid "# of digits"
+msgid "# of Digits"
 msgstr "Nº de dígitos"
 
 #. 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 "<span states=\"init,ready\"> o </span>"
 
 #. 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
 #, fuzzy
 msgid "Account fields"
 msgstr "Cuentas"
 
 #. 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 "Plantilla de cuenta"
 
@@ -44,38 +51,45 @@ msgstr ""
 "Cuenta que necesita ser actualizada (nueva o cambiada en la plantilla)."
 
 #. 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 "Cuenta a actualizar"
 
 #. 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 "Cuentas"
 
 #. 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
+#, fuzzy
+#| msgid "Account template"
+msgid "Accounts matching"
+msgstr "Plantilla de cuenta"
+
+#. 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 "Plan contable"
 
 #. 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 "Planes contables"
 
 #. 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 "Plan contable"
 
 #. 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 "Cerrar"
 
 #. 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 "Compañía"
 
@@ -85,116 +99,121 @@ msgid "Configuration"
 msgstr "Configuración"
 
 #. 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 "Continuar en errores"
 
 #. 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 "Crear/Actualizar"
 
 #. 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 "Creada cuenta %s."
 
 #. 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 "Creado por"
 
 #. 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
 #, fuzzy, python-format
 msgid "Created fiscal position %s."
 msgstr "Creada o actualizada posición fiscal %s."
 
 #. 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 "Creado el"
 
 #. 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 "Creado impuesto %s."
 
 #. 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 "Deactivado impuesto %s."
 
 #. 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 "Impuestos desactivados"
 
 #. module: account_chart_update
-#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_tax_type_tax_use
+#: model:ir.model.fields,help:account_chart_update.field_wizard_update_charts_accounts_tax__type_tax_use
+#, fuzzy
+#| 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."
 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."
+"used by itself, however it can still be used in a group. 'adjustment' is "
+"used to perform tax adjustment."
 msgstr ""
 "Determina dónde puede seleccionarse un impuesto. Nota : 'Ninguno' significa "
 "que un impuesto no puede ser usado por si mismo; aun así, puede utilizarse "
 "en un grupo."
 
 #. 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 "Diferencias en estos campos: %s."
 
 #. 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 "Nombre a mostrar"
 
 #. 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 "Excepción creando cuenta %s."
 
 #. 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 "Excepción escribiendo cuenta %s."
 
 #. 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 ""
 "Las cuentas existentes serán actualizadas. Las cuentas se buscan por código."
 
 #. 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 ""
@@ -202,14 +221,14 @@ msgstr ""
 "fiscales se buscan por nombre."
 
 #. 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 ""
 "Los impuestos existentes serán actualizados. Los impuestos se buscan por "
 "nombre."
 
 #. 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
 #, fuzzy
 msgid "Field options"
 msgstr "Otras opciones"
@@ -220,13 +239,13 @@ 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
 #, fuzzy
 msgid "Fiscal position fields"
 msgstr "Posiciones fiscales"
 
 #. 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 "Plantilla posición fiscal"
 
@@ -239,18 +258,25 @@ msgstr ""
 "plantilla)"
 
 #. 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 "Posición fiscal a actualizar"
 
 #. 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 "Posiciones fiscales"
 
 #. 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
+#, fuzzy
+#| msgid "Fiscal positions"
+msgid "Fiscal positions matching"
+msgstr "Posiciones fiscales"
+
+#. 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."
@@ -260,37 +286,37 @@ msgstr ""
 "idioma."
 
 #. 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
 #, fuzzy
 msgid "General options"
 msgstr "Otras opciones"
 
 #. 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 select the fields you want to check if they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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."
@@ -299,110 +325,117 @@ msgstr ""
 "errores."
 
 #. 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
+#, fuzzy
+#| 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)"
 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)"
+"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 ""
 "Si deja estas opciones establecidas, el asistente no solo crearé nuevos "
 "registros, si no que también actualizará registros con cambios (por ejemplo, "
 "diferente importe de impuesto)"
 
 #. 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 "Incluye todos los planes contables."
 
 #. 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 "Idioma"
 
 #. 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 "Última modificación en"
 
 #. 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 "Última actualización por"
 
 #. 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 "Última actualización el"
 
 #. 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 "Registro (Log)"
 
 #. 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 "Mensajes y errores"
 
 #. 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 "Nombre o descripción no encontrada."
 
 #. 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 "Nuevas cuentas"
 
 #. 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 "Nuevas posiciones fiscales"
 
 #. 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 "Nuevos impuestos"
 
@@ -414,45 +447,41 @@ msgid "New template"
 msgstr "Nueva plantilla"
 
 #. 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 "Siguiente"
 
 #. 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 "No se ha encontrado cuenta con este código."
 
 #. 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 "No se ha encontrado posición fiscal con este nombre."
 
 #. 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 ""
-"Nº de dígitos a usar para el código de cuenta. Asegúrese que es el mismo "
-"número que las cuentas existentes."
 
 #. 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 "Nota: Solo los campos cambiados se actualizan."
 
 #. 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 "Notas"
 
 #. 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"
@@ -464,39 +493,39 @@ msgstr ""
 "%s"
 
 #. 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 "Otras opciones"
 
 #. 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 "Impuesto %s post-actualizado."
 
 #. 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 "Anterior"
 
 #. 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 "Registros a crear/actualizar"
 
 #. 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
 #, fuzzy
 msgid "Rejected New Account Number"
 msgstr "Número de nuevas cuentas rechazadas"
 
 #. 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
 #, fuzzy
 msgid "Rejected Updated Account Number"
 msgstr "Número de cuentas a actualizar rechazadas"
@@ -507,46 +536,46 @@ msgid "Select records to update"
 msgstr "Seleccione registros a actualizar"
 
 #. 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 "Estado"
 
 #. 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 "Resumen de objetos creados"
 
 #. 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 "Resumen de objetos actualizados"
 
 #. 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 "Ámbito del impuesto"
 
 #. 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 "Impuesto desactivado."
 
 #. 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 "Plantilla de impuesto"
 
@@ -562,59 +591,63 @@ msgid "Tax to deactivate"
 msgstr "Impuesto a deactivar"
 
 #. 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 "Impuesto a actualizar"
 
 #. 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 "Impuestos"
 
 #. 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
+#: model_terms:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+#, fuzzy
+#| msgid ""
+#| "This wizard will update your accounts, taxes and fiscal positions "
+#| "according to the selected chart template"
 msgid ""
-"This wizard will update your accounts, taxes and fiscal positions according "
-"to the selected chart template"
+"This wizard will update your accounts, taxes and\n"
+"                            fiscal positions according to the selected "
+"chart\n"
+"                            template"
 msgstr ""
 "Este asistente actualizará sus cuentas, impuestos y posiciones fiscales de "
 "acuerdo con el plan contable seleccionado"
 
 #. 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 "A deactivar: no está en la plantilla"
 
 #. 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 "Tipo"
 
 #. 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
 #, fuzzy
 msgid "Update Chart Template"
 msgstr "Actualizar plan contable"
 
 #. 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
 #, fuzzy
 msgid "Update Taxes, fiscal positions or chart of accounts."
 msgstr "Actualizar plan contable"
 
 #. 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 "Actualizar cuentas"
 
@@ -624,84 +657,84 @@ msgid "Update chart of accounts"
 msgstr "Actualizar plan contable"
 
 #. 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 "Actualizar plan contable"
 
 #. 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 "Asistente de actualización de plan contable"
 
 #. 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 "Actualizar posiciones fiscales"
 
 #. 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 "¿Actualizar registros?"
 
 #. 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 "Actualizar impuestos"
 
 #. 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 "Cuenta %s actualizada."
 
 #. 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
 #, fuzzy, python-format
 msgid "Updated account %s. (Recreated XML-ID)"
 msgstr "Cuenta %s actualizada."
 
 #. 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 "Cuentas actualizadas"
 
 #. 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
 #, fuzzy, python-format
 msgid "Updated fiscal position %s."
 msgstr "Posiciones fiscales actualizadas"
 
 #. 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
 #, fuzzy, python-format
 msgid "Updated fiscal position %s. (Recreated XML-ID)"
 msgstr "Posiciones fiscales actualizadas"
 
 #. 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 "Posiciones fiscales actualizadas"
 
 #. 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 "Impuesto %s actualizado."
 
 #. 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
 #, fuzzy, python-format
 msgid "Updated tax %s. (Recreated XML-IDs)"
 msgstr "Impuesto %s actualizado."
 
 #. 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 "Impuestos actualizados"
 
@@ -712,6 +745,18 @@ msgstr "Impuestos actualizados"
 msgid "Updated template"
 msgstr "Plantilla actualizada"
 
+#. 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
+#, fuzzy
+#| msgid "wizard.update.charts.accounts"
+msgid "Wizard Update Charts Accounts"
+msgstr "wizard.update.charts.accounts"
+
 #. module: account_chart_update
 #: selection:wizard.update.charts.accounts,state:0
 msgid "Wizard completed"
@@ -727,17 +772,14 @@ 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 "wizard.update.charts.accounts"
+#~ msgid ""
+#~ "No. of digits to use for account code. Make sure it is the same number as "
+#~ "existing accounts."
+#~ msgstr ""
+#~ "Nº de dígitos a usar para el código de cuenta. Asegúrese que es el mismo "
+#~ "número que las cuentas existentes."
diff --git a/account_chart_update/i18n/es_AR.po b/account_chart_update/i18n/es_AR.po
index 1f7336b56..55445fa1a 100644
--- a/account_chart_update/i18n/es_AR.po
+++ b/account_chart_update/i18n/es_AR.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 "Mostrar Nombre"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Última modificación en"
 
 #. 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 "Última actualización realizada por"
 
 #. 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 "Última actualización el"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es_CL.po b/account_chart_update/i18n/es_CL.po
index 9b89a3b01..a45cda1d2 100644
--- a/account_chart_update/i18n/es_CL.po
+++ b/account_chart_update/i18n/es_CL.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 "Nombre mostrado"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID (identificación)"
 
 #. 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
+#: model_terms: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)"
+"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 "Última modificación en"
 
 #. 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 "Última actualización de"
 
 #. 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 "Última actualización en"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es_CO.po b/account_chart_update/i18n/es_CO.po
index 650318f85..d102fddce 100644
--- a/account_chart_update/i18n/es_CO.po
+++ b/account_chart_update/i18n/es_CO.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Creado por"
 
 #. 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 "Creado"
 
 #. 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
+#: 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."
+"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 "Nombre Público"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Última Modificación el"
 
 #. 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 "Actualizado por"
 
 #. 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 "Actualizado"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es_CR.po b/account_chart_update/i18n/es_CR.po
index 42c92a96f..84996d282 100644
--- a/account_chart_update/i18n/es_CR.po
+++ b/account_chart_update/i18n/es_CR.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 "Compañía"
 
@@ -86,123 +96,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Ultima actualización por"
 
 #. 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 "Ultima actualización en"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es_DO.po b/account_chart_update/i18n/es_DO.po
index 23c343c0e..5101bb512 100644
--- a/account_chart_update/i18n/es_DO.po
+++ b/account_chart_update/i18n/es_DO.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 "Nombre mostrado"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Última modificación en"
 
 #. 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 "Última actualización de"
 
 #. 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 "Última actualización en"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es_EC.po b/account_chart_update/i18n/es_EC.po
index 0fa2bbbd1..ea6a981c7 100644
--- a/account_chart_update/i18n/es_EC.po
+++ b/account_chart_update/i18n/es_EC.po
@@ -21,22 +21,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -46,38 +51,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 "Compañía"
 
@@ -87,123 +97,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 "Nombre mostrado"
 
 #. 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 ""
 
@@ -213,12 +224,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 ""
 
@@ -229,161 +240,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID (identificación)"
 
 #. 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
+#: model_terms: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)"
+"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 "Última modificación en"
 
 #. 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 "Última actualización de"
 
 #. 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 "Última actualización en"
 
 #. 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 ""
 
@@ -395,43 +414,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"
@@ -440,38 +457,38 @@ msgid ""
 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 ""
 
@@ -481,46 +498,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 "Estado"
 
 #. 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 ""
 
@@ -535,55 +552,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -593,84 +610,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 ""
 
@@ -681,6 +698,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"
@@ -696,17 +723,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es_ES.po b/account_chart_update/i18n/es_ES.po
index 77ab1799c..e1434be00 100644
--- a/account_chart_update/i18n/es_ES.po
+++ b/account_chart_update/i18n/es_ES.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 "Compañía"
 
@@ -86,123 +96,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 "Nombre para mostrar"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Última modificación en"
 
 #. 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 "Última actualización por"
 
 #. 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 "Última actualización en"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 "Estado"
 
 #. 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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es_MX.po b/account_chart_update/i18n/es_MX.po
index 2a931d8e8..cb84901e7 100644
--- a/account_chart_update/i18n/es_MX.po
+++ b/account_chart_update/i18n/es_MX.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 "Compañía"
 
@@ -86,123 +96,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 "Nombre desplegado"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Ultima modificacion realizada"
 
 #. 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 "Ultima actualizacion por"
 
 #. 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 "Ultima actualización realizada"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 "Estado"
 
 #. 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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es_PE.po b/account_chart_update/i18n/es_PE.po
index fab575276..c46809591 100644
--- a/account_chart_update/i18n/es_PE.po
+++ b/account_chart_update/i18n/es_PE.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 "Nombre a Mostrar"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Ultima Modificación en"
 
 #. 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 "Actualizado última vez por"
 
 #. 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 "Ultima Actualización"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es_PY.po b/account_chart_update/i18n/es_PY.po
index 456c120c6..ffcd6f627 100644
--- a/account_chart_update/i18n/es_PY.po
+++ b/account_chart_update/i18n/es_PY.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Ultima actualización por"
 
 #. 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 "Ultima actualización en"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/es_VE.po b/account_chart_update/i18n/es_VE.po
index 17acd31ba..a7747144e 100644
--- a/account_chart_update/i18n/es_VE.po
+++ b/account_chart_update/i18n/es_VE.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 "Mostrar nombre"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Modificada por última vez"
 
 #. 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 "Última actualización realizada por"
 
 #. 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 "Ultima actualizacion en"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/et.po b/account_chart_update/i18n/et.po
index 987e1e102..767113223 100644
--- a/account_chart_update/i18n/et.po
+++ b/account_chart_update/i18n/et.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 "Ettevõte"
 
@@ -85,123 +95,124 @@ 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 "Loonud"
 
 #. 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 "Loodud"
 
 #. 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
+#: 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."
+"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 "Näidatav nimi"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Viimati muudetud"
 
 #. 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 "Viimati uuendatud"
 
 #. 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 "Viimati uuendatud"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 "Olek"
 
 #. 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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Tüüp"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/eu.po b/account_chart_update/i18n/eu.po
index f3c457df4..9466d0e29 100644
--- a/account_chart_update/i18n/eu.po
+++ b/account_chart_update/i18n/eu.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 ""
 
@@ -85,123 +95,124 @@ 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 "Nork sortua"
 
 #. 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 "Created on"
 
 #. 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
+#: 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."
+"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 "Izena erakutsi"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Last Updated by"
 
 #. 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 "Last Updated on"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Mota"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/fa.po b/account_chart_update/i18n/fa.po
index 573c74bc1..b4047cbd8 100644
--- a/account_chart_update/i18n/fa.po
+++ b/account_chart_update/i18n/fa.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
@@ -44,38 +49,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 ""
 
@@ -85,123 +95,124 @@ 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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
+#: model_terms: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)"
+"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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/fi.po b/account_chart_update/i18n/fi.po
index 75162f840..4ce2dd64a 100644
--- a/account_chart_update/i18n/fi.po
+++ b/account_chart_update/i18n/fi.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 "Yritys"
 
@@ -85,123 +95,124 @@ 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 "Luonut"
 
 #. 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 "Luotu"
 
 #. 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
+#: 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."
+"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 "Nimi"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Viimeksi muokattu"
 
 #. 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 "Viimeksi päivittänyt"
 
 #. 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 "Viimeksi päivitetty"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Tyyppi"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/fr.po b/account_chart_update/i18n/fr.po
index 8ec86748b..1ca9d0840 100644
--- a/account_chart_update/i18n/fr.po
+++ b/account_chart_update/i18n/fr.po
@@ -19,23 +19,28 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\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
 #, fuzzy
 msgid "Account fields"
 msgstr "Comptes"
 
 #. 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 ""
 
@@ -45,38 +50,45 @@ 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 "Comptes"
 
 #. 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
+#, fuzzy
+#| msgid "Accounts"
+msgid "Accounts matching"
+msgstr "Comptes"
+
+#. 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 "Société"
 
@@ -86,123 +98,124 @@ 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 "Créer par"
 
 #. 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 "Créer le"
 
 #. 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
+#: 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."
+"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 "Nom à afficher"
 
 #. 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 ""
 
@@ -212,12 +225,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 ""
 
@@ -228,161 +241,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Dernière modification le"
 
 #. 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 "Mis à jour par"
 
 #. 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 "Mis à jour le"
 
 #. 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 ""
 
@@ -394,43 +415,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"
@@ -439,38 +458,38 @@ msgid ""
 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 ""
 
@@ -480,46 +499,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 "État"
 
 #. 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 ""
 
@@ -534,55 +553,55 @@ 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
+#: model_terms: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"
+"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 "Type"
 
 #. 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 ""
 
@@ -592,84 +611,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 ""
 
@@ -680,6 +699,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"
@@ -695,17 +724,7 @@ 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 ""
diff --git a/account_chart_update/i18n/fr_CA.po b/account_chart_update/i18n/fr_CA.po
index 27bfcd3c1..b3b96f1fb 100644
--- a/account_chart_update/i18n/fr_CA.po
+++ b/account_chart_update/i18n/fr_CA.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Créé par"
 
 #. 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 "Créé le"
 
 #. 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
+#: 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."
+"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 "Afficher le nom"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "Identifiant"
 
 #. 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
+#: model_terms: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)"
+"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 "Dernière mise à jour par"
 
 #. 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 "Dernière mise à jour le"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/fr_CH.po b/account_chart_update/i18n/fr_CH.po
index 177983c12..49d222f00 100644
--- a/account_chart_update/i18n/fr_CH.po
+++ b/account_chart_update/i18n/fr_CH.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Créé par"
 
 #. 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 "Créé le"
 
 #. 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
+#: 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."
+"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 "Nom affiché"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Dernière modification le"
 
 #. 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 "Modifié par"
 
 #. 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 "Modifié le"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/gl.po b/account_chart_update/i18n/gl.po
index e36e2c29a..15d6ce721 100644
--- a/account_chart_update/i18n/gl.po
+++ b/account_chart_update/i18n/gl.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 ""
 
@@ -85,123 +95,124 @@ 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 "Creado por"
 
 #. 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 "Creado en"
 
 #. 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Última modificación"
 
 #. 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 "ültima actualización por"
 
 #. 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 "Última actualización en"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/gl_ES.po b/account_chart_update/i18n/gl_ES.po
index e2fa3486c..401ec31de 100644
--- a/account_chart_update/i18n/gl_ES.po
+++ b/account_chart_update/i18n/gl_ES.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/gu.po b/account_chart_update/i18n/gu.po
index 0748d8bbc..46b7ea84a 100644
--- a/account_chart_update/i18n/gu.po
+++ b/account_chart_update/i18n/gu.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 "કંપની"
 
@@ -85,123 +95,124 @@ 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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
+#: model_terms: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)"
+"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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/he.po b/account_chart_update/i18n/he.po
index 6dd3ef196..4fcc1facf 100644
--- a/account_chart_update/i18n/he.po
+++ b/account_chart_update/i18n/he.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 ""
 
@@ -85,123 +95,124 @@ 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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
+#: model_terms: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)"
+"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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/hr.po b/account_chart_update/i18n/hr.po
index 7f6dab4dd..8eaf0f5f0 100644
--- a/account_chart_update/i18n/hr.po
+++ b/account_chart_update/i18n/hr.po
@@ -21,23 +21,28 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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
 #, fuzzy
 msgid "Account fields"
 msgstr "Konta"
 
 #. 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 ""
 
@@ -47,38 +52,45 @@ 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 "Konta"
 
 #. 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
+#, fuzzy
+#| msgid "Accounts"
+msgid "Accounts matching"
+msgstr "Konta"
+
+#. 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 "Zatvori"
 
 #. 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 "Organizacija"
 
@@ -88,123 +100,124 @@ 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 "Kreirao"
 
 #. 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 "Kreirano"
 
 #. 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
+#: 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."
+"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 "Prikaži ime"
 
 #. 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 ""
 
@@ -214,12 +227,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 ""
 
@@ -230,161 +243,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Zadnja izmjena dana"
 
 #. 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 "Zadnji ažurirao"
 
 #. 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 "Zadnje ažurirano dana"
 
 #. 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 ""
 
@@ -396,43 +417,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 "Sljedeći"
 
 #. 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"
@@ -441,38 +460,38 @@ msgid ""
 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 ""
 
@@ -482,46 +501,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 "Status"
 
 #. 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 ""
 
@@ -536,55 +555,55 @@ 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
+#: model_terms: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"
+"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 "Tip"
 
 #. 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 ""
 
@@ -594,84 +613,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 ""
 
@@ -682,6 +701,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"
@@ -697,17 +726,7 @@ 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 ""
diff --git a/account_chart_update/i18n/hr_HR.po b/account_chart_update/i18n/hr_HR.po
index 4e22bb984..a1b126a5e 100644
--- a/account_chart_update/i18n/hr_HR.po
+++ b/account_chart_update/i18n/hr_HR.po
@@ -21,22 +21,27 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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 ""
 
@@ -46,38 +51,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 "Poduzeće"
 
@@ -87,123 +97,124 @@ 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 "Kreirao"
 
 #. 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 "Kreirano"
 
 #. 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
+#: 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."
+"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 "Naziv"
 
 #. 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 ""
 
@@ -213,12 +224,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 ""
 
@@ -229,161 +240,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Zadnje modificirano"
 
 #. 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 "Zadnji ažurirao"
 
 #. 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 "Zadnje ažurirano"
 
 #. 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 ""
 
@@ -395,43 +414,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"
@@ -440,38 +457,38 @@ msgid ""
 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 ""
 
@@ -481,46 +498,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 ""
 
@@ -535,55 +552,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -593,84 +610,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 ""
 
@@ -681,6 +698,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"
@@ -696,17 +723,7 @@ 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 ""
diff --git a/account_chart_update/i18n/hu.po b/account_chart_update/i18n/hu.po
index 72d24e771..c0ad3b31d 100644
--- a/account_chart_update/i18n/hu.po
+++ b/account_chart_update/i18n/hu.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 "Vállalat"
 
@@ -85,123 +95,124 @@ 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 "Készítette"
 
 #. 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 "Létrehozás dátuma"
 
 #. 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
+#: 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."
+"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 "Név megjelenítése"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Utolsó frissítés dátuma"
 
 #. 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 "Utoljára frissítve, által"
 
 #. 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 "Utoljára frissítve "
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 "Státusz"
 
 #. 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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Típus"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/id.po b/account_chart_update/i18n/id.po
index e6e28797d..ae1f96822 100644
--- a/account_chart_update/i18n/id.po
+++ b/account_chart_update/i18n/id.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
@@ -44,38 +49,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 "Perusahaan"
 
@@ -85,123 +95,124 @@ 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 "Dibuat oleh"
 
 #. 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 "Dibuat pada"
 
 #. 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
+#: 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."
+"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 "Nama Tampilan"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Terakhir Dimodifikasi pada"
 
 #. 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 "Diperbaharui oleh"
 
 #. 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 "Diperbaharui pada"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Jenis"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/it.po b/account_chart_update/i18n/it.po
index adb830a40..88d14c3df 100644
--- a/account_chart_update/i18n/it.po
+++ b/account_chart_update/i18n/it.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 "Azienda"
 
@@ -85,123 +95,124 @@ 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 "Creato da"
 
 #. 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 "Creato il"
 
 #. 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
+#: 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."
+"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 "Nome da visualizzare"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Ultima modifica il"
 
 #. 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 "Last Updated by"
 
 #. 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 "Last Updated on"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 "Stato"
 
 #. 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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/ja.po b/account_chart_update/i18n/ja.po
index d71cd8200..22b0311ba 100644
--- a/account_chart_update/i18n/ja.po
+++ b/account_chart_update/i18n/ja.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
@@ -44,38 +49,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 "会社"
 
@@ -85,123 +95,124 @@ 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/ko.po b/account_chart_update/i18n/ko.po
index 8bcda6c02..c4a0b5df5 100644
--- a/account_chart_update/i18n/ko.po
+++ b/account_chart_update/i18n/ko.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
@@ -44,38 +49,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 ""
 
@@ -85,123 +95,124 @@ 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/lt.po b/account_chart_update/i18n/lt.po
index 76cc09041..eedcb6483 100644
--- a/account_chart_update/i18n/lt.po
+++ b/account_chart_update/i18n/lt.po
@@ -21,23 +21,28 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\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
 #, fuzzy
 msgid "Account fields"
 msgstr "Sąskaitos"
 
 #. 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 ""
 
@@ -47,38 +52,45 @@ 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 "Sąskaitos"
 
 #. 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
+#, fuzzy
+#| msgid "Accounts"
+msgid "Accounts matching"
+msgstr "Sąskaitos"
+
+#. 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 "Uždaryti"
 
 #. 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 "Įmonė"
 
@@ -88,123 +100,124 @@ 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 "Sukūrė"
 
 #. 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 "Sukurta"
 
 #. 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
+#: 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."
+"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 "Vaizduojamas pavadinimas"
 
 #. 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 ""
 
@@ -214,12 +227,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 ""
 
@@ -230,161 +243,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Paskutinį kartą keista"
 
 #. 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 "Paskutinį kartą atnaujino"
 
 #. 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 "Paskutinį kartą atnaujinta"
 
 #. 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 ""
 
@@ -396,43 +417,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"
@@ -441,38 +460,38 @@ msgid ""
 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 ""
 
@@ -482,46 +501,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 "Būsena"
 
 #. 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 ""
 
@@ -536,55 +555,55 @@ 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
+#: model_terms: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"
+"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 "Tipas"
 
 #. 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 ""
 
@@ -594,84 +613,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 ""
 
@@ -682,6 +701,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"
@@ -697,17 +726,7 @@ 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 ""
diff --git a/account_chart_update/i18n/lt_LT.po b/account_chart_update/i18n/lt_LT.po
index b7c261779..888c3c6cb 100644
--- a/account_chart_update/i18n/lt_LT.po
+++ b/account_chart_update/i18n/lt_LT.po
@@ -21,22 +21,27 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\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 ""
 
@@ -46,38 +51,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 ""
 
@@ -87,123 +97,124 @@ 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 "Sukūrė"
 
 #. 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 "Sukurta"
 
 #. 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
+#: 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."
+"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 ""
 
@@ -213,12 +224,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 ""
 
@@ -229,161 +240,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Paskutinį kartą atnaujino"
 
 #. 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 "Paskutinį kartą atnaujinta"
 
 #. 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 ""
 
@@ -395,43 +414,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"
@@ -440,38 +457,38 @@ msgid ""
 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 ""
 
@@ -481,46 +498,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 ""
 
@@ -535,55 +552,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -593,84 +610,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 ""
 
@@ -681,6 +698,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"
@@ -696,17 +723,7 @@ 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 ""
diff --git a/account_chart_update/i18n/lv.po b/account_chart_update/i18n/lv.po
index ed4251742..74b896e18 100644
--- a/account_chart_update/i18n/lv.po
+++ b/account_chart_update/i18n/lv.po
@@ -20,22 +20,27 @@ msgstr ""
 "2);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Izveidoja"
 
 #. 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 "Izveidots"
 
 #. 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Pēdējo reizi atjaunoja"
 
 #. 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 "Pēdējās izmaiņas"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tips"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/mk.po b/account_chart_update/i18n/mk.po
index 640f0eeb5..eef85ae69 100644
--- a/account_chart_update/i18n/mk.po
+++ b/account_chart_update/i18n/mk.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\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 ""
 
@@ -44,38 +49,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 "Компанија"
 
@@ -85,123 +95,124 @@ 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/mn.po b/account_chart_update/i18n/mn.po
index faeb3a01f..9d91c26aa 100644
--- a/account_chart_update/i18n/mn.po
+++ b/account_chart_update/i18n/mn.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 "Компани"
 
@@ -85,123 +95,124 @@ 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/nb.po b/account_chart_update/i18n/nb.po
index fedf8bd26..723e6c1c0 100644
--- a/account_chart_update/i18n/nb.po
+++ b/account_chart_update/i18n/nb.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 "Firma"
 
@@ -86,123 +96,124 @@ 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 "Opprettet av"
 
 #. 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 "Opprettet den"
 
 #. 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
+#: 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."
+"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 "Visnings navn"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Sist oppdatert "
 
 #. 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 "Sist oppdatert av"
 
 #. 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 "Sist oppdatert"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Type"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/nb_NO.po b/account_chart_update/i18n/nb_NO.po
index 6db0b08a8..6f986b757 100644
--- a/account_chart_update/i18n/nb_NO.po
+++ b/account_chart_update/i18n/nb_NO.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Laget av"
 
 #. 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 "Laget den"
 
 #. 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
+#: 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."
+"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 "Vis navn"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Sist endret den"
 
 #. 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 "Sist oppdatert av"
 
 #. 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 "Sist oppdatert den"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/nl.po b/account_chart_update/i18n/nl.po
index 427618356..61e9f4eba 100644
--- a/account_chart_update/i18n/nl.po
+++ b/account_chart_update/i18n/nl.po
@@ -20,23 +20,28 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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
 #, fuzzy
 msgid "Account fields"
 msgstr "Kostenplaatsen"
 
 #. 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 ""
 
@@ -46,38 +51,45 @@ 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 "Kostenplaatsen"
 
 #. 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
+#, fuzzy
+#| msgid "Accounts"
+msgid "Accounts matching"
+msgstr "Kostenplaatsen"
+
+#. 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 "Bedrijf"
 
@@ -87,123 +99,124 @@ 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 "Aangemaakt door"
 
 #. 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 "Aangemaakt op"
 
 #. 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
+#: 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."
+"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 "Te tonen naam"
 
 #. 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 ""
 
@@ -213,12 +226,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 ""
 
@@ -229,161 +242,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Laatst bijgewerkt op"
 
 #. 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 "Laatst bijgewerkt door"
 
 #. 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 "Laatst bijgewerkt op"
 
 #. 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 ""
 
@@ -395,43 +416,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"
@@ -440,38 +459,38 @@ msgid ""
 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 ""
 
@@ -481,46 +500,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 "Status"
 
 #. 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 ""
 
@@ -535,55 +554,55 @@ 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
+#: model_terms: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"
+"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 "Type"
 
 #. 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 ""
 
@@ -593,84 +612,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 ""
 
@@ -681,6 +700,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"
@@ -696,17 +725,7 @@ 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 ""
diff --git a/account_chart_update/i18n/nl_BE.po b/account_chart_update/i18n/nl_BE.po
index a4f24c70a..69e42dd09 100644
--- a/account_chart_update/i18n/nl_BE.po
+++ b/account_chart_update/i18n/nl_BE.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 "Bedrijf"
 
@@ -86,123 +96,124 @@ 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 "Gemaakt door"
 
 #. 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 "Gemaakt op"
 
 #. 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
+#: 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."
+"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 "Schermnaam"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Laatst Aangepast op"
 
 #. 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 "Laatst bijgewerkt door"
 
 #. 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 "Laatst bijgewerkt op"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 "Status"
 
 #. 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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Type"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/nl_NL.po b/account_chart_update/i18n/nl_NL.po
index caff566ec..71d04096e 100644
--- a/account_chart_update/i18n/nl_NL.po
+++ b/account_chart_update/i18n/nl_NL.po
@@ -20,23 +20,28 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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
 #, fuzzy
 msgid "Account fields"
 msgstr "Rekeningen"
 
 #. 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 ""
 
@@ -46,38 +51,45 @@ 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 "Rekeningen"
 
 #. 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
+#, fuzzy
+#| msgid "Accounts"
+msgid "Accounts matching"
+msgstr "Rekeningen"
+
+#. 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 "Bedrijf"
 
@@ -87,123 +99,124 @@ 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 "Aangemaakt door"
 
 #. 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 "Aangemaakt op"
 
 #. 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
+#: 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."
+"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 "Te tonen naam"
 
 #. 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 ""
 
@@ -213,12 +226,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 ""
 
@@ -229,161 +242,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Laatst bijgewerkt op"
 
 #. 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 "Laatst bijgewerkt door"
 
 #. 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 "Laatst bijgewerkt op"
 
 #. 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 ""
 
@@ -395,43 +416,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"
@@ -440,38 +459,38 @@ msgid ""
 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 ""
 
@@ -481,46 +500,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 ""
 
@@ -535,55 +554,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -593,84 +612,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 ""
 
@@ -681,6 +700,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"
@@ -696,17 +725,7 @@ 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 ""
diff --git a/account_chart_update/i18n/pl.po b/account_chart_update/i18n/pl.po
index 9347733be..2fc1c7da3 100644
--- a/account_chart_update/i18n/pl.po
+++ b/account_chart_update/i18n/pl.po
@@ -21,22 +21,27 @@ msgstr ""
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\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 ""
 
@@ -46,38 +51,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 ""
 
@@ -87,123 +97,124 @@ 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 "Utworzone przez"
 
 #. 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 "Utworzono"
 
 #. 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
+#: 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."
+"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 "Wyświetlana nazwa "
 
 #. 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 ""
 
@@ -213,12 +224,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 ""
 
@@ -229,161 +240,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Ostatnio modyfikowano"
 
 #. 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 "Ostatnio modyfikowane przez"
 
 #. 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 "Ostatnia zmiana"
 
 #. 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 ""
 
@@ -395,43 +414,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"
@@ -440,38 +457,38 @@ msgid ""
 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 ""
 
@@ -481,46 +498,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 ""
 
@@ -535,55 +552,55 @@ 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
+#: model_terms: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"
+"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 "Typ"
 
 #. 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 ""
 
@@ -593,84 +610,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 ""
 
@@ -681,6 +698,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"
@@ -696,17 +723,7 @@ 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 ""
diff --git a/account_chart_update/i18n/pt.po b/account_chart_update/i18n/pt.po
index bf494c694..7bfa37088 100644
--- a/account_chart_update/i18n/pt.po
+++ b/account_chart_update/i18n/pt.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 "Empresa"
 
@@ -85,123 +95,124 @@ 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 "Criado por"
 
 #. 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 "Criado em"
 
 #. 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
+#: 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."
+"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 "Nome"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Última Modificação Em"
 
 #. 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 "Atualizado pela última vez por"
 
 #. 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 "Atualizado pela última vez em"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 "Estado"
 
 #. 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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/pt_BR.po b/account_chart_update/i18n/pt_BR.po
index b36e36a19..1efb4b616 100644
--- a/account_chart_update/i18n/pt_BR.po
+++ b/account_chart_update/i18n/pt_BR.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 ""
 
@@ -45,38 +50,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 "Empresa"
 
@@ -86,123 +96,124 @@ 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 "Criado por"
 
 #. 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 "Criado em"
 
 #. 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
+#: 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."
+"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 "Nome para Mostrar"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "Identificação"
 
 #. 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
+#: model_terms: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)"
+"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 "Última atualização em"
 
 #. 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 "Última atualização por"
 
 #. 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 "Última atualização em"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 "Situação"
 
 #. 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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/pt_PT.po b/account_chart_update/i18n/pt_PT.po
index 146400387..30f7b194d 100644
--- a/account_chart_update/i18n/pt_PT.po
+++ b/account_chart_update/i18n/pt_PT.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -45,38 +50,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 "Empresa"
 
@@ -86,123 +96,124 @@ 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 "Criado por"
 
 #. 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 "Criado em"
 
 #. 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
+#: 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."
+"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 "Nome a exibir"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Modificado pela última vez em"
 
 #. 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 "Atualizado pela última vez por"
 
 #. 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 "Atualizado pela última vez em"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 "Estado"
 
 #. 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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tipo"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/ro.po b/account_chart_update/i18n/ro.po
index c7847a092..01b226516 100644
--- a/account_chart_update/i18n/ro.po
+++ b/account_chart_update/i18n/ro.po
@@ -20,22 +20,27 @@ msgstr ""
 "2:1));\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 ""
 
@@ -45,38 +50,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 "Companie"
 
@@ -86,123 +96,124 @@ 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 "Creat de"
 
 #. 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 "Creat la"
 
 #. 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
+#: 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."
+"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 "Nume Afişat"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Ultima actualizare în"
 
 #. 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 "Ultima actualizare făcută de"
 
 #. 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 "Ultima actualizare la"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 "Stare"
 
 #. 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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/ru.po b/account_chart_update/i18n/ru.po
index 882b7c640..9e99b2f7b 100644
--- a/account_chart_update/i18n/ru.po
+++ b/account_chart_update/i18n/ru.po
@@ -21,22 +21,27 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\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 ""
 
@@ -46,38 +51,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 "Компания"
 
@@ -87,123 +97,124 @@ 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
+#: 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."
+"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 ""
 
@@ -213,12 +224,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 ""
 
@@ -229,161 +240,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 ""
 
@@ -395,43 +414,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"
@@ -440,38 +457,38 @@ msgid ""
 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 ""
 
@@ -481,46 +498,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 ""
 
@@ -535,55 +552,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -593,84 +610,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 ""
 
@@ -681,6 +698,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"
@@ -696,17 +723,7 @@ 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 ""
diff --git a/account_chart_update/i18n/sk.po b/account_chart_update/i18n/sk.po
index 87f16a081..f258bea8a 100644
--- a/account_chart_update/i18n/sk.po
+++ b/account_chart_update/i18n/sk.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 ""
 
@@ -44,38 +49,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 "Spoločnosť"
 
@@ -85,123 +95,124 @@ 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 "Vytvoril"
 
 #. 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 "Vytvorené"
 
 #. 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
+#: 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."
+"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 "Zobraziť meno"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Posledná modifikácia"
 
 #. 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 "Naposledy upravil"
 
 #. 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 "Naposledy upravené"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Typ"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/sl.po b/account_chart_update/i18n/sl.po
index ce4421945..dac1effd1 100644
--- a/account_chart_update/i18n/sl.po
+++ b/account_chart_update/i18n/sl.po
@@ -20,22 +20,27 @@ msgstr ""
 "%100==4 ? 2 : 3);\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 ""
 
@@ -45,38 +50,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 "Družba"
 
@@ -86,123 +96,124 @@ 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 "Ustvaril"
 
 #. 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 "Ustvarjeno"
 
 #. 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
+#: 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."
+"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 "Prikazni naziv"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Zadnjič spremenjeno"
 
 #. 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 "Zadnjič posodobil"
 
 #. 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 "Zadnjič posodobljeno"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 "Status"
 
 #. 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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tip"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/sr.po b/account_chart_update/i18n/sr.po
index 231f5e7d8..4ac1ad429 100644
--- a/account_chart_update/i18n/sr.po
+++ b/account_chart_update/i18n/sr.po
@@ -20,22 +20,27 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Kreiran"
 
 #. 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 "Tip"
 
 #. 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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/sr@latin.po b/account_chart_update/i18n/sr@latin.po
index 3019e22a4..7dafde5dc 100644
--- a/account_chart_update/i18n/sr@latin.po
+++ b/account_chart_update/i18n/sr@latin.po
@@ -21,22 +21,27 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 ""
 
@@ -46,38 +51,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 ""
 
@@ -87,123 +97,124 @@ 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 "Kreirao"
 
 #. 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 "Kreiran"
 
 #. 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
+#: 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."
+"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 "Ime za prikaz"
 
 #. 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 ""
 
@@ -213,12 +224,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 ""
 
@@ -229,161 +240,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Zadnja izmjena"
 
 #. 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 "Zadnja izmjena"
 
 #. 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 "Zadnja izmjena"
 
 #. 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 ""
 
@@ -395,43 +414,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"
@@ -440,38 +457,38 @@ msgid ""
 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 ""
 
@@ -481,46 +498,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 ""
 
@@ -535,55 +552,55 @@ 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
+#: model_terms: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"
+"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 "Tip"
 
 #. 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 ""
 
@@ -593,84 +610,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 ""
 
@@ -681,6 +698,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"
@@ -696,17 +723,7 @@ 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 ""
diff --git a/account_chart_update/i18n/sv.po b/account_chart_update/i18n/sv.po
index 186c5254e..a2edaadc3 100644
--- a/account_chart_update/i18n/sv.po
+++ b/account_chart_update/i18n/sv.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
 
@@ -44,38 +49,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 "Bolag"
 
@@ -85,123 +95,124 @@ 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 "Skapad av"
 
 #. 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 "Skapad den"
 
 #. 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
+#: 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."
+"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 "Visa namn"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Senast redigerad"
 
 #. 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 "Senast uppdaterad av"
 
 #. 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 "Senast uppdaterad"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Typ"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/th.po b/account_chart_update/i18n/th.po
index 4dd3ff026..14dd0d048 100644
--- a/account_chart_update/i18n/th.po
+++ b/account_chart_update/i18n/th.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
@@ -44,38 +49,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 "บริษัท"
 
@@ -85,123 +95,124 @@ 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
+#: 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."
+"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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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
+#: model_terms: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)"
+"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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/tr.po b/account_chart_update/i18n/tr.po
index 85c09d4c9..04211b11d 100644
--- a/account_chart_update/i18n/tr.po
+++ b/account_chart_update/i18n/tr.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 ""
 
@@ -44,38 +49,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 "Şirket"
 
@@ -85,123 +95,124 @@ 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 "Oluşturan"
 
 #. 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 "Oluşturuldu"
 
 #. 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
+#: 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."
+"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 "Görünen İsim"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Son değişiklik"
 
 #. 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 "Son güncelleyen"
 
 #. 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 "Son güncelleme"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 "Durum"
 
 #. 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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Tipi"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/tr_TR.po b/account_chart_update/i18n/tr_TR.po
index a4a837293..c1458bb4e 100644
--- a/account_chart_update/i18n/tr_TR.po
+++ b/account_chart_update/i18n/tr_TR.po
@@ -21,22 +21,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
@@ -46,38 +51,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 "Firma"
 
@@ -87,123 +97,124 @@ 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 "Oluşturan"
 
 #. 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 "Oluşturulma tarihi"
 
 #. 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
+#: 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."
+"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 "Görünen ad"
 
 #. 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 ""
 
@@ -213,12 +224,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 ""
 
@@ -229,161 +240,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "Kimlik"
 
 #. 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
+#: model_terms: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)"
+"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 "En son güncelleme tarihi"
 
 #. 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 "En son güncelleyen "
 
 #. 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 "En son güncelleme tarihi"
 
 #. 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 ""
 
@@ -395,43 +414,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"
@@ -440,38 +457,38 @@ msgid ""
 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 ""
 
@@ -481,46 +498,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 "Durumu"
 
 #. 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 ""
 
@@ -535,55 +552,55 @@ 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
+#: model_terms: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"
+"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 "Tip"
 
 #. 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 ""
 
@@ -593,84 +610,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 ""
 
@@ -681,6 +698,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"
@@ -696,17 +723,7 @@ 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 ""
diff --git a/account_chart_update/i18n/uk.po b/account_chart_update/i18n/uk.po
index a430bb0b5..8b09729bc 100644
--- a/account_chart_update/i18n/uk.po
+++ b/account_chart_update/i18n/uk.po
@@ -20,22 +20,27 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/vi.po b/account_chart_update/i18n/vi.po
index b651acd73..faec06887 100644
--- a/account_chart_update/i18n/vi.po
+++ b/account_chart_update/i18n/vi.po
@@ -19,22 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
@@ -44,38 +49,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 ""
 
@@ -85,123 +95,124 @@ 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 "Được tạo bởi"
 
 #. 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 "Được tạo vào"
 
 #. 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
+#: 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."
+"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 "Tên hiển thị"
 
 #. 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 ""
 
@@ -211,12 +222,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 ""
 
@@ -227,161 +238,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Sửa lần cuối vào"
 
 #. 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 "Last Updated by"
 
 #. 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 "Cập nhật lần cuối vào"
 
 #. 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 ""
 
@@ -393,43 +412,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"
@@ -438,38 +455,38 @@ msgid ""
 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 ""
 
@@ -479,46 +496,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 ""
 
@@ -533,55 +550,55 @@ 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
+#: model_terms: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"
+"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 "Loại"
 
 #. 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 ""
 
@@ -591,84 +608,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 ""
 
@@ -679,6 +696,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"
@@ -694,17 +721,7 @@ 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 ""
diff --git a/account_chart_update/i18n/vi_VN.po b/account_chart_update/i18n/vi_VN.po
index 35adcd987..da766bfd2 100644
--- a/account_chart_update/i18n/vi_VN.po
+++ b/account_chart_update/i18n/vi_VN.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
@@ -45,38 +50,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 ""
 
@@ -86,123 +96,124 @@ 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 "Tạo bởi"
 
 #. 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 "Tạo vào"
 
 #. 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Cập nhật lần cuối bởi"
 
 #. 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 "Cập nhật lần cuối vào"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/zh_CN.po b/account_chart_update/i18n/zh_CN.po
index 15283130d..d4dbff373 100644
--- a/account_chart_update/i18n/zh_CN.po
+++ b/account_chart_update/i18n/zh_CN.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
@@ -45,38 +50,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 "公司"
 
@@ -86,123 +96,124 @@ 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
+#: 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."
+"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 "Display Name"
 
 #. 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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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 "ID"
 
 #. 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
+#: model_terms: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)"
+"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 "Last Modified on"
 
 #. 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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""
diff --git a/account_chart_update/i18n/zh_TW.po b/account_chart_update/i18n/zh_TW.po
index 8e03bf26e..635035a1c 100644
--- a/account_chart_update/i18n/zh_TW.po
+++ b/account_chart_update/i18n/zh_TW.po
@@ -20,22 +20,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\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 ""
 
@@ -45,38 +50,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 "公司"
 
@@ -86,123 +96,124 @@ 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
+#: 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."
+"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 ""
 
@@ -212,12 +223,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 ""
 
@@ -228,161 +239,169 @@ msgid ""
 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
+#: 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 they have been updated "
-"in the templates."
+"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
+#: model_terms: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)"
+"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 ""
 
@@ -394,43 +413,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"
@@ -439,38 +456,38 @@ msgid ""
 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 ""
 
@@ -480,46 +497,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 ""
 
@@ -534,55 +551,55 @@ 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
+#: model_terms: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"
+"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 ""
 
@@ -592,84 +609,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 ""
 
@@ -680,6 +697,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"
@@ -695,17 +722,7 @@ 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 ""