diff --git a/account_move_template/i18n/am.po b/account_move_template/i18n/am.po
index 131d60d5..b47a4492 100644
--- a/account_move_template/i18n/am.po
+++ b/account_move_template/i18n/am.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/ar.po b/account_move_template/i18n/ar.po
index 12abf52d..6830038a 100644
--- a/account_move_template/i18n/ar.po
+++ b/account_move_template/i18n/ar.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "اسم العرض"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "المعرف"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/bg.po b/account_move_template/i18n/bg.po
index 01e05547..317654ae 100644
--- a/account_move_template/i18n/bg.po
+++ b/account_move_template/i18n/bg.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Име за показване"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/bs.po b/account_move_template/i18n/bs.po
index 0ea4b565..84765aaf 100644
--- a/account_move_template/i18n/bs.po
+++ b/account_move_template/i18n/bs.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Prikaži naziv"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/ca.po b/account_move_template/i18n/ca.po
index baaf4955..23d33d43 100644
--- a/account_move_template/i18n/ca.po
+++ b/account_move_template/i18n/ca.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Veure el nom"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/ca_ES.po b/account_move_template/i18n/ca_ES.po
index 7f6b048e..97b77777 100644
--- a/account_move_template/i18n/ca_ES.po
+++ b/account_move_template/i18n/ca_ES.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/cs.po b/account_move_template/i18n/cs.po
index dd89df18..1064336b 100644
--- a/account_move_template/i18n/cs.po
+++ b/account_move_template/i18n/cs.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Zobrazovaný název"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/da.po b/account_move_template/i18n/da.po
index d9b0924b..749d2c36 100644
--- a/account_move_template/i18n/da.po
+++ b/account_move_template/i18n/da.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Vist navn"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "Id"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/de.po b/account_move_template/i18n/de.po
index d2f9d758..75c64319 100644
--- a/account_move_template/i18n/de.po
+++ b/account_move_template/i18n/de.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -59,30 +65,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Betrag"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -110,11 +111,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -166,6 +162,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -186,11 +183,17 @@ msgid "Display Name"
 msgstr "Anzeigename"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -205,28 +208,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -267,6 +273,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -362,6 +369,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -380,11 +388,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -396,11 +400,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -431,7 +430,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -440,14 +438,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -474,6 +464,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -500,6 +491,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -516,6 +508,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/el_GR.po b/account_move_template/i18n/el_GR.po
index e89c777c..e5d63568 100644
--- a/account_move_template/i18n/el_GR.po
+++ b/account_move_template/i18n/el_GR.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "Κωδικός"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/en_AU.po b/account_move_template/i18n/en_AU.po
index 00f8467f..8a26cadd 100644
--- a/account_move_template/i18n/en_AU.po
+++ b/account_move_template/i18n/en_AU.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/en_GB.po b/account_move_template/i18n/en_GB.po
index 5276cf12..51d8a774 100644
--- a/account_move_template/i18n/en_GB.po
+++ b/account_move_template/i18n/en_GB.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Display Name"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/es.po b/account_move_template/i18n/es.po
index b47a2a11..02c57fb9 100644
--- a/account_move_template/i18n/es.po
+++ b/account_move_template/i18n/es.po
@@ -35,11 +35,17 @@ msgstr ""
 "        "
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copy)"
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid ">"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -63,31 +69,26 @@ msgstr "Activo"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Importe"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "Analítica"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "Etiquetas analíticas"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
-msgstr "Archivar"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
+msgstr ""
 
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
@@ -114,11 +115,6 @@ msgstr "Compañía"
 msgid "Company Currency"
 msgstr "Moneda la compañía"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "Calcular fórmula"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -169,6 +165,7 @@ msgid "Debit"
 msgstr "Débito"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -189,11 +186,17 @@ msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "Asiento desde plantilla %s"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -208,36 +211,32 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
-"Imposible calcular la fórmula con secuencia %s (fórmula: %s). Revise que las "
-"líneas utilizadas en la fórmula existan y que tengan una secuencia menor que "
-"la secuencia de la línea actual."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
-"Imposible calcular la fórmula de la línea con secuencia %s (fórmula: %s): la "
-"sintaxis de la fórmula es errónea."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
-"Diccionario inválido: {}\n"
-"{}"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__is_refund
@@ -277,6 +276,7 @@ msgid "Journal Item Template"
 msgstr "Plantilla de asiento"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -371,6 +371,7 @@ msgid "Overwrite"
 msgstr "Sobreescribir"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -389,11 +390,7 @@ msgid "Payment Terms"
 msgstr "Términos de pago"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr "Código Python"
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -407,11 +404,6 @@ msgstr ""
 msgid "Reference"
 msgstr "Referencia"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr "Reestablecer"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -442,7 +434,6 @@ msgstr "Línea de distribución de impuestos"
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr "Impuestos"
 
@@ -451,16 +442,6 @@ msgstr "Impuestos"
 msgid "Template"
 msgstr "Plantilla"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-"La plantilla seleccionada (%s) no es de la misma compañía (%s) que el "
-"usuario actual (%s)."
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -487,6 +468,7 @@ msgid "User input"
 msgstr "Introducción de usuario"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -514,6 +496,7 @@ msgid "Wizard to generate move from template"
 msgstr "Asistente para generar un asiento a partir de una plantilla"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -535,6 +518,7 @@ msgstr ""
 "ejemplo: <i>L1</i> para la línea con secuencia 1. Ejemplos:"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -545,3 +529,55 @@ msgstr ""
 "Ha eliminado una línea en el asistente. Esto no está permitido: debe o bien "
 "actualizar la plantilla o modificar el asiento que será generado por este "
 "asistente."
+
+#~ msgid "Analytic Account"
+#~ msgstr "Cuenta analítica"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "Etiquetas analíticas"
+
+#~ msgid "Archive"
+#~ msgstr "Archivar"
+
+#~ msgid "Compute Formula"
+#~ msgstr "Calcular fórmula"
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s). "
+#~ "Check that the lines used in the formula really exists and have a lower "
+#~ "sequence than the current line."
+#~ msgstr ""
+#~ "Imposible calcular la fórmula con secuencia %s (fórmula: %s). Revise que "
+#~ "las líneas utilizadas en la fórmula existan y que tengan una secuencia "
+#~ "menor que la secuencia de la línea actual."
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s): "
+#~ "the syntax of the formula is wrong."
+#~ msgstr ""
+#~ "Imposible calcular la fórmula de la línea con secuencia %s (fórmula: %s): "
+#~ "la sintaxis de la fórmula es errónea."
+
+#, python-format
+#~ msgid ""
+#~ "Invalid dictionary: {}\n"
+#~ "{}"
+#~ msgstr ""
+#~ "Diccionario inválido: {}\n"
+#~ "{}"
+
+#~ msgid "Python Code"
+#~ msgstr "Código Python"
+
+#~ msgid "Restore"
+#~ msgstr "Reestablecer"
+
+#, python-format
+#~ msgid ""
+#~ "The selected template (%s) is not in the same company (%s) as the current "
+#~ "user (%s)."
+#~ msgstr ""
+#~ "La plantilla seleccionada (%s) no es de la misma compañía (%s) que el "
+#~ "usuario actual (%s)."
diff --git a/account_move_template/i18n/es_AR.po b/account_move_template/i18n/es_AR.po
index 2c649722..e3b569f4 100644
--- a/account_move_template/i18n/es_AR.po
+++ b/account_move_template/i18n/es_AR.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2022-06-20 00:05+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/teams/"
-"23907/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/"
+"teams/23907/es_AR/)\n"
 "Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,11 +36,17 @@ msgstr ""
 "        "
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -64,31 +70,26 @@ msgstr "Activo"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Monto"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "Analítico"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "Etiquetas Analíticas"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
-msgstr "Archivo"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
+msgstr ""
 
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
@@ -115,11 +116,6 @@ msgstr "Compañía"
 msgid "Company Currency"
 msgstr "Moneda de la Compañía"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "Computar Fórmula"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -170,6 +166,7 @@ msgid "Debit"
 msgstr "Débito"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -190,11 +187,17 @@ msgid "Display Name"
 msgstr "Mostrar Nombre"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "Entrada desde plantilla %s"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -209,36 +212,32 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
-"Imposible computar la fórmula de la línea con secuencia %s (fórmula: %s). "
-"Verifique que las líneas utilizadas en la fórmula realmente existan y tengan "
-"una secuencia más baja que la línea actual."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
-"Imposible computar la fórmula de la línea con secuencia %s (fórmula: %s): la "
-"sintaxis de la fórmula es incorrecta."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
-"Diccionario inválido: {}\n"
-"{}"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__is_refund
@@ -278,6 +277,7 @@ msgid "Journal Item Template"
 msgstr "Plantilla de Apunte Contable"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -372,6 +372,7 @@ msgid "Overwrite"
 msgstr "Sobreescribir"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -390,11 +391,7 @@ msgid "Payment Terms"
 msgstr "Términos de Pago"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr "Código Python"
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -408,11 +405,6 @@ msgstr ""
 msgid "Reference"
 msgstr "Referencia"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr "Restaurar"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -443,7 +435,6 @@ msgstr "Línea de Repartición de Impuesto"
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr "Impuestos"
 
@@ -452,16 +443,6 @@ msgstr "Impuestos"
 msgid "Template"
 msgstr "Plantilla"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-"La plantilla seleccionada (%s) no está en la misma compañía (%s) que el "
-"usuario actual (%s)."
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -488,6 +469,7 @@ msgid "User input"
 msgstr "Entrada de usuario"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -514,6 +496,7 @@ msgid "Wizard to generate move from template"
 msgstr "Asistente para generar movimiento desde plantilla"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -535,6 +518,7 @@ msgstr ""
 "para lalínea con secuencia = 1. Ejemplos:"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -545,3 +529,55 @@ msgstr ""
 "Borró una línea en el asistente. Esto no está permitido: debe actualizar la "
 "plantilla o modificar el asiento contable que será generado por este "
 "asistente."
+
+#~ msgid "Analytic Account"
+#~ msgstr "Cuenta Analítica"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "Etiquetas Analíticas"
+
+#~ msgid "Archive"
+#~ msgstr "Archivo"
+
+#~ msgid "Compute Formula"
+#~ msgstr "Computar Fórmula"
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s). "
+#~ "Check that the lines used in the formula really exists and have a lower "
+#~ "sequence than the current line."
+#~ msgstr ""
+#~ "Imposible computar la fórmula de la línea con secuencia %s (fórmula: %s). "
+#~ "Verifique que las líneas utilizadas en la fórmula realmente existan y "
+#~ "tengan una secuencia más baja que la línea actual."
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s): "
+#~ "the syntax of the formula is wrong."
+#~ msgstr ""
+#~ "Imposible computar la fórmula de la línea con secuencia %s (fórmula: %s): "
+#~ "la sintaxis de la fórmula es incorrecta."
+
+#, python-format
+#~ msgid ""
+#~ "Invalid dictionary: {}\n"
+#~ "{}"
+#~ msgstr ""
+#~ "Diccionario inválido: {}\n"
+#~ "{}"
+
+#~ msgid "Python Code"
+#~ msgstr "Código Python"
+
+#~ msgid "Restore"
+#~ msgstr "Restaurar"
+
+#, python-format
+#~ msgid ""
+#~ "The selected template (%s) is not in the same company (%s) as the current "
+#~ "user (%s)."
+#~ msgstr ""
+#~ "La plantilla seleccionada (%s) no está en la misma compañía (%s) que el "
+#~ "usuario actual (%s)."
diff --git a/account_move_template/i18n/es_CL.po b/account_move_template/i18n/es_CL.po
index 74ffc213..1662911d 100644
--- a/account_move_template/i18n/es_CL.po
+++ b/account_move_template/i18n/es_CL.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/es_CO.po b/account_move_template/i18n/es_CO.po
index 82c77cb1..373dd3dd 100644
--- a/account_move_template/i18n/es_CO.po
+++ b/account_move_template/i18n/es_CO.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Nombre Público"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/es_CR.po b/account_move_template/i18n/es_CR.po
index e2d76340..fa0ccee2 100644
--- a/account_move_template/i18n/es_CR.po
+++ b/account_move_template/i18n/es_CR.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/es_DO.po b/account_move_template/i18n/es_DO.po
index 63983bdd..3184bb6a 100644
--- a/account_move_template/i18n/es_DO.po
+++ b/account_move_template/i18n/es_DO.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/es_EC.po b/account_move_template/i18n/es_EC.po
index 5c91af97..6ac530e5 100644
--- a/account_move_template/i18n/es_EC.po
+++ b/account_move_template/i18n/es_EC.po
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -60,30 +66,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Monto"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -111,11 +112,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -167,6 +163,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -187,11 +184,17 @@ msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -206,28 +209,31 @@ msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -268,6 +274,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -363,6 +370,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -381,11 +389,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -397,11 +401,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -432,7 +431,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -441,14 +439,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -475,6 +465,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -501,6 +492,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -517,6 +509,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/es_ES.po b/account_move_template/i18n/es_ES.po
index 749abb8c..6101a89a 100644
--- a/account_move_template/i18n/es_ES.po
+++ b/account_move_template/i18n/es_ES.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Nombre para mostrar"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/es_MX.po b/account_move_template/i18n/es_MX.po
index 8cc7d54a..fddf625d 100644
--- a/account_move_template/i18n/es_MX.po
+++ b/account_move_template/i18n/es_MX.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Nombre desplegado"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/es_PE.po b/account_move_template/i18n/es_PE.po
index 9636d8a7..1fac7753 100644
--- a/account_move_template/i18n/es_PE.po
+++ b/account_move_template/i18n/es_PE.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/es_PY.po b/account_move_template/i18n/es_PY.po
index 8f3f4714..ce9f969b 100644
--- a/account_move_template/i18n/es_PY.po
+++ b/account_move_template/i18n/es_PY.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/es_VE.po b/account_move_template/i18n/es_VE.po
index 2f0fedb4..9549b795 100644
--- a/account_move_template/i18n/es_VE.po
+++ b/account_move_template/i18n/es_VE.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Mostrar nombre"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/et.po b/account_move_template/i18n/et.po
index 444658c6..2b8e2048 100644
--- a/account_move_template/i18n/et.po
+++ b/account_move_template/i18n/et.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Näidatav nimi"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/eu.po b/account_move_template/i18n/eu.po
index 28941913..43fdc98b 100644
--- a/account_move_template/i18n/eu.po
+++ b/account_move_template/i18n/eu.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Izena erakutsi"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/fa.po b/account_move_template/i18n/fa.po
index a4131070..a6d4c461 100644
--- a/account_move_template/i18n/fa.po
+++ b/account_move_template/i18n/fa.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "نام نمایشی"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "شناسه"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/fi.po b/account_move_template/i18n/fi.po
index 17df8b85..63f08fa4 100644
--- a/account_move_template/i18n/fi.po
+++ b/account_move_template/i18n/fi.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Nimi"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/fr.po b/account_move_template/i18n/fr.po
index fce7ce70..fd2e1de0 100644
--- a/account_move_template/i18n/fr.po
+++ b/account_move_template/i18n/fr.po
@@ -35,11 +35,17 @@ msgstr ""
 "        "
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -63,30 +69,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Montant"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "Analytique"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "Compte analytique"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "Etiquettes analytiques"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -114,11 +115,6 @@ msgstr "Société"
 msgid "Company Currency"
 msgstr "Devise de la société"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "Calculer"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -169,6 +165,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -189,11 +186,17 @@ msgid "Display Name"
 msgstr "Afficher le nom"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "Ecriture(s) à partir du modèle %s"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -208,33 +211,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
-"Impossible de calculer la formule de ligne avec la séquence %s (formule: "
-"%s). Vérifiez que les lignes utilisées dans la formule existent réellement "
-"et qu'elles ont une séquence inférieure à la ligne courante."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
-"Impossible de calculer la formule de ligne avec la séquence %s (formule: "
-"%s): la syntaxe de la formule est erronée."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -275,6 +276,7 @@ msgid "Journal Item Template"
 msgstr "Ligne de modèle d'écriture"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -369,6 +371,7 @@ msgid "Overwrite"
 msgstr "Ecrase"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -387,11 +390,7 @@ msgid "Payment Terms"
 msgstr "Conditions de paiement"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -403,11 +402,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -438,7 +432,6 @@ msgstr "Ligne de répartition des taxes"
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -447,16 +440,6 @@ msgstr ""
 msgid "Template"
 msgstr "Modèle"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-"Le modèle sélectionné (%s) ne fait pas partie de la même société (%s) que "
-"l'utilisateur actuel (%s)."
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -483,6 +466,7 @@ msgid "User input"
 msgstr "Saisi"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -509,6 +493,7 @@ msgid "Wizard to generate move from template"
 msgstr "Assistant pour générer un mouvement à partir d'un modèle"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -531,6 +516,7 @@ msgstr ""
 "Exemples :"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -542,6 +528,41 @@ msgstr ""
 "vous devez soit mettre à jour le modèle, soit modifier l'écriture de journal "
 "qui sera générée par cet assistant."
 
+#~ msgid "Analytic Account"
+#~ msgstr "Compte analytique"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "Etiquettes analytiques"
+
+#~ msgid "Compute Formula"
+#~ msgstr "Calculer"
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s). "
+#~ "Check that the lines used in the formula really exists and have a lower "
+#~ "sequence than the current line."
+#~ msgstr ""
+#~ "Impossible de calculer la formule de ligne avec la séquence %s (formule: "
+#~ "%s). Vérifiez que les lignes utilisées dans la formule existent "
+#~ "réellement et qu'elles ont une séquence inférieure à la ligne courante."
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s): "
+#~ "the syntax of the formula is wrong."
+#~ msgstr ""
+#~ "Impossible de calculer la formule de ligne avec la séquence %s (formule: "
+#~ "%s): la syntaxe de la formule est erronée."
+
+#, python-format
+#~ msgid ""
+#~ "The selected template (%s) is not in the same company (%s) as the current "
+#~ "user (%s)."
+#~ msgstr ""
+#~ "Le modèle sélectionné (%s) ne fait pas partie de la même société (%s) que "
+#~ "l'utilisateur actuel (%s)."
+
 #~ msgid "Add an internal note here..."
 #~ msgstr "Ajouter une note interne ici…"
 
diff --git a/account_move_template/i18n/fr_CA.po b/account_move_template/i18n/fr_CA.po
index 7d2cc940..38ab64f9 100644
--- a/account_move_template/i18n/fr_CA.po
+++ b/account_move_template/i18n/fr_CA.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Afficher le nom"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "Identifiant"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/fr_CH.po b/account_move_template/i18n/fr_CH.po
index 2966c3b1..2959fc50 100644
--- a/account_move_template/i18n/fr_CH.po
+++ b/account_move_template/i18n/fr_CH.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/fr_FR.po b/account_move_template/i18n/fr_FR.po
index af6e83fb..800c1d95 100644
--- a/account_move_template/i18n/fr_FR.po
+++ b/account_move_template/i18n/fr_FR.po
@@ -36,11 +36,17 @@ msgstr ""
 "        "
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -64,30 +70,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Montant"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "Analytique"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "Compte analytique"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "Etiquettes analytiques"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -115,11 +116,6 @@ msgstr "Société"
 msgid "Company Currency"
 msgstr "Devise de la société"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "Calculer"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -170,6 +166,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -190,11 +187,17 @@ msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "Ecriture(s) à partir du modèle %s"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -209,33 +212,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
-"Impossible de calculer la formule de ligne avec la séquence %s (formule: "
-"%s). Vérifiez que les lignes utilisées dans la formule existent réellement "
-"et qu'elles ont une séquence inférieure à la ligne courante."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
-"Impossible de calculer la formule de ligne avec la séquence %s (formule: "
-"%s): la syntaxe de la formule est erronée."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -276,6 +277,7 @@ msgid "Journal Item Template"
 msgstr "Modèle de ligne écriture"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -370,6 +372,7 @@ msgid "Overwrite"
 msgstr "Ecrase"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -388,11 +391,7 @@ msgid "Payment Terms"
 msgstr "Conditions de paiement"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -404,11 +403,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -439,7 +433,6 @@ msgstr "Ligne de répartition des taxes"
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -448,16 +441,6 @@ msgstr ""
 msgid "Template"
 msgstr "Modèle"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-"Le modèle sélectionné (%s) ne fait pas partie de la même société (%s) que "
-"l'utilisateur actuel (%s)."
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -484,6 +467,7 @@ msgid "User input"
 msgstr "Saisi"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -510,6 +494,7 @@ msgid "Wizard to generate move from template"
 msgstr "Assistant pour générer un mouvement à partir d'un modèle"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -532,6 +517,7 @@ msgstr ""
 "Exemples :"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -543,6 +529,41 @@ msgstr ""
 "vous devez soit mettre à jour le modèle, soit modifier l'écriture de journal "
 "qui sera générée par cet assistant."
 
+#~ msgid "Analytic Account"
+#~ msgstr "Compte analytique"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "Etiquettes analytiques"
+
+#~ msgid "Compute Formula"
+#~ msgstr "Calculer"
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s). "
+#~ "Check that the lines used in the formula really exists and have a lower "
+#~ "sequence than the current line."
+#~ msgstr ""
+#~ "Impossible de calculer la formule de ligne avec la séquence %s (formule: "
+#~ "%s). Vérifiez que les lignes utilisées dans la formule existent "
+#~ "réellement et qu'elles ont une séquence inférieure à la ligne courante."
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s): "
+#~ "the syntax of the formula is wrong."
+#~ msgstr ""
+#~ "Impossible de calculer la formule de ligne avec la séquence %s (formule: "
+#~ "%s): la syntaxe de la formule est erronée."
+
+#, python-format
+#~ msgid ""
+#~ "The selected template (%s) is not in the same company (%s) as the current "
+#~ "user (%s)."
+#~ msgstr ""
+#~ "Le modèle sélectionné (%s) ne fait pas partie de la même société (%s) que "
+#~ "l'utilisateur actuel (%s)."
+
 #~ msgid "Add an internal note here..."
 #~ msgstr "Ajouter une note interne ici…"
 
diff --git a/account_move_template/i18n/gl.po b/account_move_template/i18n/gl.po
index 74c1826c..ad856b7b 100644
--- a/account_move_template/i18n/gl.po
+++ b/account_move_template/i18n/gl.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/gl_ES.po b/account_move_template/i18n/gl_ES.po
index a88884de..887ee950 100644
--- a/account_move_template/i18n/gl_ES.po
+++ b/account_move_template/i18n/gl_ES.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/gu.po b/account_move_template/i18n/gu.po
index 03562e19..6f1b2859 100644
--- a/account_move_template/i18n/gu.po
+++ b/account_move_template/i18n/gu.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -163,6 +159,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -183,11 +180,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -202,28 +205,31 @@ msgid "ID"
 msgstr "ઓળખ"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -264,6 +270,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -358,6 +365,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -376,11 +384,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -392,11 +396,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -427,7 +426,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -436,14 +434,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -470,6 +460,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -496,6 +487,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -512,6 +504,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/he.po b/account_move_template/i18n/he.po
index f7c08d0f..a2dd0223 100644
--- a/account_move_template/i18n/he.po
+++ b/account_move_template/i18n/he.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "השם המוצג"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "מזהה"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/hi.po b/account_move_template/i18n/hi.po
index 7b70fb40..d96956d3 100644
--- a/account_move_template/i18n/hi.po
+++ b/account_move_template/i18n/hi.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -163,6 +159,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -183,11 +180,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -202,28 +205,31 @@ msgid "ID"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -264,6 +270,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -358,6 +365,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -376,11 +384,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -392,11 +396,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -427,7 +426,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -436,14 +434,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -470,6 +460,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -496,6 +487,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -512,6 +504,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/hr.po b/account_move_template/i18n/hr.po
index 4dce3c60..60e48b0b 100644
--- a/account_move_template/i18n/hr.po
+++ b/account_move_template/i18n/hr.po
@@ -32,11 +32,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopija)"
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -60,30 +66,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Iznos"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "Analitika"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "Analitički konto"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "Oznake analitike"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -111,11 +112,6 @@ msgstr "Tvrtka"
 msgid "Company Currency"
 msgstr "Valuta tvrtke"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "Formula za izračun"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -166,6 +162,7 @@ msgid "Debit"
 msgstr "Duguje"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -186,11 +183,17 @@ msgid "Display Name"
 msgstr "Prikaži ime"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "Stavka iz predloška %s"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -205,28 +208,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -267,6 +273,7 @@ msgid "Journal Item Template"
 msgstr "Predložak temeljnice"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr "Uvjeti plaćanja"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr "Python Code"
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr "Referenca"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr "Porezi"
 
@@ -439,14 +437,6 @@ msgstr "Porezi"
 msgid "Template"
 msgstr "Predložak"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr "Odabrani predložak (%s) nije u istoj tvrtci (%s) kao i korisnik (%s)."
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr "Ručni unos"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr "Čarobnjak za kreiranje temeljnice iz predloška"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -523,6 +516,25 @@ msgid ""
 "this wizard."
 msgstr ""
 
+#~ msgid "Analytic Account"
+#~ msgstr "Analitički konto"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "Oznake analitike"
+
+#~ msgid "Compute Formula"
+#~ msgstr "Formula za izračun"
+
+#~ msgid "Python Code"
+#~ msgstr "Python Code"
+
+#, python-format
+#~ msgid ""
+#~ "The selected template (%s) is not in the same company (%s) as the current "
+#~ "user (%s)."
+#~ msgstr ""
+#~ "Odabrani predložak (%s) nije u istoj tvrtci (%s) kao i korisnik (%s)."
+
 #~ msgid "Load"
 #~ msgstr "Učitaj"
 
diff --git a/account_move_template/i18n/hr_HR.po b/account_move_template/i18n/hr_HR.po
index 73cebae2..8d1443cc 100644
--- a/account_move_template/i18n/hr_HR.po
+++ b/account_move_template/i18n/hr_HR.po
@@ -32,11 +32,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -60,30 +66,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -111,11 +112,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -167,6 +163,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -187,11 +184,17 @@ msgid "Display Name"
 msgstr "Naziv"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -206,28 +209,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -268,6 +274,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -363,6 +370,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -381,11 +389,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -397,11 +401,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -432,7 +431,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -441,14 +439,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -475,6 +465,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -501,6 +492,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -517,6 +509,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/hu.po b/account_move_template/i18n/hu.po
index 15349a7c..c63e9e05 100644
--- a/account_move_template/i18n/hu.po
+++ b/account_move_template/i18n/hu.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Név megjelenítése"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/id.po b/account_move_template/i18n/id.po
index 0ee186e8..2c07e7ff 100644
--- a/account_move_template/i18n/id.po
+++ b/account_move_template/i18n/id.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Nama Tampilan"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/it.po b/account_move_template/i18n/it.po
index 4fc3fec5..3c9f4485 100644
--- a/account_move_template/i18n/it.po
+++ b/account_move_template/i18n/it.po
@@ -35,11 +35,17 @@ msgstr ""
 "        "
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -63,31 +69,26 @@ msgstr "Attivo"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Importo"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "Analitico"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "Conto analitico"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "Tag analitici"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
-msgstr "Archivia"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
+msgstr ""
 
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
@@ -114,11 +115,6 @@ msgstr "Azienda"
 msgid "Company Currency"
 msgstr "Valuta aziendale"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "Calcola formula"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -169,6 +165,7 @@ msgid "Debit"
 msgstr "Dare"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -189,11 +186,17 @@ msgid "Display Name"
 msgstr "Nome visualizzato"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "Record da Modello %s"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -208,36 +211,32 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
-"Impossibile calcolare la formula della riga con sequenza %s ( Formula: %s). "
-"Controlla che le righe usate nella formula esistano veramente e abbiano una "
-"sequenza inferiore alla riga corrente."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
-"Impossibile calcolare la formula della riga con sequenza %s (formula: %s): "
-"la sintassi della formula è sbagliata."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
-"Dizionario non valido: {}\n"
-"{}"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__is_refund
@@ -277,6 +276,7 @@ msgid "Journal Item Template"
 msgstr "Modello Oggetto Registro"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -371,6 +371,7 @@ msgid "Overwrite"
 msgstr "Sovrascivi"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -389,11 +390,7 @@ msgid "Payment Terms"
 msgstr "Termini di pagamento"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr "Codice Python"
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -406,11 +403,6 @@ msgstr ""
 msgid "Reference"
 msgstr "Riferimento"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr "Ristabilire"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -441,7 +433,6 @@ msgstr "Riga di ripartizione fiscale"
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr "Imposte"
 
@@ -450,16 +441,6 @@ msgstr "Imposte"
 msgid "Template"
 msgstr "Modello"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-"Il modello selezionato (%s) non è nella stessa azienda (%s) dell'utente "
-"corrente (%s)."
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -478,7 +459,8 @@ msgstr "Tipo"
 #. module: account_move_template
 #: model:ir.model.fields,help:account_move_template.field_account_move_template_line__payment_term_id
 msgid "Used to compute the due date of the journal item."
-msgstr "Utilizzato per calcolare la data di scadenza dell'articolo di registro."
+msgstr ""
+"Utilizzato per calcolare la data di scadenza dell'articolo di registro."
 
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__input
@@ -486,6 +468,7 @@ msgid "User input"
 msgstr "Input Utente"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -512,6 +495,7 @@ msgid "Wizard to generate move from template"
 msgstr "Procedura guidata per generare movimenti dal Template"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -533,6 +517,7 @@ msgstr ""
 "<i>L1</i> per riga con sequenza = 1. Esempio:"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -543,3 +528,55 @@ msgstr ""
 "Hai eliminato una riga nella procedura guidata. questo non è permesso: è "
 "necessario aggiornare il modello o modificare la registrazione contabile che "
 "verrà generata da questa procedura guidata."
+
+#~ msgid "Analytic Account"
+#~ msgstr "Conto analitico"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "Tag analitici"
+
+#~ msgid "Archive"
+#~ msgstr "Archivia"
+
+#~ msgid "Compute Formula"
+#~ msgstr "Calcola formula"
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s). "
+#~ "Check that the lines used in the formula really exists and have a lower "
+#~ "sequence than the current line."
+#~ msgstr ""
+#~ "Impossibile calcolare la formula della riga con sequenza %s ( Formula: "
+#~ "%s). Controlla che le righe usate nella formula esistano veramente e "
+#~ "abbiano una sequenza inferiore alla riga corrente."
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s): "
+#~ "the syntax of the formula is wrong."
+#~ msgstr ""
+#~ "Impossibile calcolare la formula della riga con sequenza %s (formula: "
+#~ "%s): la sintassi della formula è sbagliata."
+
+#, python-format
+#~ msgid ""
+#~ "Invalid dictionary: {}\n"
+#~ "{}"
+#~ msgstr ""
+#~ "Dizionario non valido: {}\n"
+#~ "{}"
+
+#~ msgid "Python Code"
+#~ msgstr "Codice Python"
+
+#~ msgid "Restore"
+#~ msgstr "Ristabilire"
+
+#, python-format
+#~ msgid ""
+#~ "The selected template (%s) is not in the same company (%s) as the current "
+#~ "user (%s)."
+#~ msgstr ""
+#~ "Il modello selezionato (%s) non è nella stessa azienda (%s) dell'utente "
+#~ "corrente (%s)."
diff --git a/account_move_template/i18n/ja.po b/account_move_template/i18n/ja.po
index 81d0bbdd..3f403b51 100644
--- a/account_move_template/i18n/ja.po
+++ b/account_move_template/i18n/ja.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "表示名"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/ko.po b/account_move_template/i18n/ko.po
index df29a44b..0943e50d 100644
--- a/account_move_template/i18n/ko.po
+++ b/account_move_template/i18n/ko.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "표시 이름"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/lo.po b/account_move_template/i18n/lo.po
index 32f2f832..451bafe1 100644
--- a/account_move_template/i18n/lo.po
+++ b/account_move_template/i18n/lo.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -163,6 +159,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -183,11 +180,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -202,28 +205,31 @@ msgid "ID"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -264,6 +270,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -358,6 +365,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -376,11 +384,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -392,11 +396,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -427,7 +426,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -436,14 +434,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -470,6 +460,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -496,6 +487,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -512,6 +504,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/lt.po b/account_move_template/i18n/lt.po
index 81874fbf..3f68c29a 100644
--- a/account_move_template/i18n/lt.po
+++ b/account_move_template/i18n/lt.po
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -59,30 +65,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -110,11 +111,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -166,6 +162,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -186,11 +183,17 @@ msgid "Display Name"
 msgstr "Vaizduojamas pavadinimas"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -205,28 +208,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -267,6 +273,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -362,6 +369,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -380,11 +388,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -396,11 +400,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -431,7 +430,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -440,14 +438,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -474,6 +464,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -500,6 +491,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -516,6 +508,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/lt_LT.po b/account_move_template/i18n/lt_LT.po
index 1c48c54b..3e22d1be 100644
--- a/account_move_template/i18n/lt_LT.po
+++ b/account_move_template/i18n/lt_LT.po
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -59,30 +65,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -110,11 +111,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -166,6 +162,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -186,11 +183,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -205,28 +208,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -267,6 +273,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/lv.po b/account_move_template/i18n/lv.po
index 5d7cb543..02dd415c 100644
--- a/account_move_template/i18n/lv.po
+++ b/account_move_template/i18n/lv.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/mk.po b/account_move_template/i18n/mk.po
index 072725fd..6de69479 100644
--- a/account_move_template/i18n/mk.po
+++ b/account_move_template/i18n/mk.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Прикажи име"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/mn.po b/account_move_template/i18n/mn.po
index b3602b7d..dbc057d1 100644
--- a/account_move_template/i18n/mn.po
+++ b/account_move_template/i18n/mn.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Дэлгэцийн Нэр"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/nb.po b/account_move_template/i18n/nb.po
index 26bbef3d..7514c280 100644
--- a/account_move_template/i18n/nb.po
+++ b/account_move_template/i18n/nb.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Visnings navn"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/nb_NO.po b/account_move_template/i18n/nb_NO.po
index 66e2d692..5bf8018c 100644
--- a/account_move_template/i18n/nb_NO.po
+++ b/account_move_template/i18n/nb_NO.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Vis navn"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/nl.po b/account_move_template/i18n/nl.po
index 68608572..72cf8520 100644
--- a/account_move_template/i18n/nl.po
+++ b/account_move_template/i18n/nl.po
@@ -37,11 +37,17 @@ msgstr ""
 "        "
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Kopie)"
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -66,30 +72,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Bedrag"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "kostenplaats"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "Kostenplaats"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "Kostenplaatslabels"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -117,11 +118,6 @@ msgstr "Bedrijf"
 msgid "Company Currency"
 msgstr "Bedrijfsvaluta"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "Bereken formule"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -173,6 +169,7 @@ msgid "Debit"
 msgstr "Debet"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, fuzzy, python-format
 msgid "Debit and credit of all lines are null."
@@ -193,11 +190,17 @@ msgid "Display Name"
 msgstr "Te tonen naam"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "Mutatie vanuit sjabloon %s"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -212,28 +215,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -275,6 +281,7 @@ msgid "Journal Item Template"
 msgstr "boeking sjabloon"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -370,6 +377,7 @@ msgid "Overwrite"
 msgstr "Overschrijven"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -388,11 +396,7 @@ msgid "Payment Terms"
 msgstr "Betalingsconditie"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr "Python Code"
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, fuzzy, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -404,11 +408,6 @@ msgstr "Python Code moet zijn opgegeven voor berekende regel met volgorde %d."
 msgid "Reference"
 msgstr "Referentie"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -439,7 +438,6 @@ msgstr "Belastingscorrectie regel"
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr "Belastingen"
 
@@ -448,16 +446,6 @@ msgstr "Belastingen"
 msgid "Template"
 msgstr "Sjabloon"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-"Het geselecteerde sjabloon (%s) bevind zich niet binnen hetzelfde bedrijf "
-"(%s) als de huidige gebruiker (%s)."
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -484,6 +472,7 @@ msgid "User input"
 msgstr "Gebruikersinvoer"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -510,6 +499,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -526,6 +516,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -534,6 +525,26 @@ msgid ""
 "this wizard."
 msgstr ""
 
+#~ msgid "Analytic Account"
+#~ msgstr "Kostenplaats"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "Kostenplaatslabels"
+
+#~ msgid "Compute Formula"
+#~ msgstr "Bereken formule"
+
+#~ msgid "Python Code"
+#~ msgstr "Python Code"
+
+#, python-format
+#~ msgid ""
+#~ "The selected template (%s) is not in the same company (%s) as the current "
+#~ "user (%s)."
+#~ msgstr ""
+#~ "Het geselecteerde sjabloon (%s) bevind zich niet binnen hetzelfde bedrijf "
+#~ "(%s) als de huidige gebruiker (%s)."
+
 #~ msgid "Add an internal note here..."
 #~ msgstr "Voeg interne notitie toe..."
 
diff --git a/account_move_template/i18n/nl_BE.po b/account_move_template/i18n/nl_BE.po
index 172b5fe4..2723ae0f 100644
--- a/account_move_template/i18n/nl_BE.po
+++ b/account_move_template/i18n/nl_BE.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Schermnaam"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/nl_NL.po b/account_move_template/i18n/nl_NL.po
index b71bc8b8..ceb24772 100644
--- a/account_move_template/i18n/nl_NL.po
+++ b/account_move_template/i18n/nl_NL.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Te tonen naam"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/pl.po b/account_move_template/i18n/pl.po
index 00188bfe..51e50552 100644
--- a/account_move_template/i18n/pl.po
+++ b/account_move_template/i18n/pl.po
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -59,30 +65,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -110,11 +111,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -166,6 +162,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -186,11 +183,17 @@ msgid "Display Name"
 msgstr "Wyświetlana nazwa "
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -205,28 +208,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -267,6 +273,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -362,6 +369,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -380,11 +388,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -396,11 +400,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -431,7 +430,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -440,14 +438,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -474,6 +464,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -500,6 +491,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -516,6 +508,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/pt.po b/account_move_template/i18n/pt.po
index 39a05f05..b4fd0316 100644
--- a/account_move_template/i18n/pt.po
+++ b/account_move_template/i18n/pt.po
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -59,31 +65,26 @@ msgstr "Ativo"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Montante"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "Analítica"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "Conta Analítica"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "Etiquetas Analíticas"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
-msgstr "Arquivar"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
+msgstr ""
 
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
@@ -110,11 +111,6 @@ msgstr "Empresa"
 msgid "Company Currency"
 msgstr "Moeda da Empresa"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "Calcular Fórmula"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr "Débito"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Nome a Exibir"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "Movimento a partir do modelo %s"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,36 +207,32 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
-"Impossível calcular a fórmula da linha com sequência %s (formula: %s). "
-"Verifique que as linhas usadas na formula existem de facto e têm sequência "
-"mais baixa que a linha atual."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
-"Impossível calculara a f´rmula da linha com a sequência%s (formula: %s): a "
-"sintaxe da fórmula está errada."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
-"Dicionário inválido: {}\n"
-"{}"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__is_refund
@@ -273,6 +272,7 @@ msgid "Journal Item Template"
 msgstr "Modelo de Item de Diário"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -367,6 +367,7 @@ msgid "Overwrite"
 msgstr "Sobrescrever"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -385,11 +386,7 @@ msgid "Payment Terms"
 msgstr "Termos de Pagamento"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr "Código Python"
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -402,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr "Referência"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr "Restaurar"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -437,7 +429,6 @@ msgstr "Linha de Repartição de Impostos"
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr "Impostos"
 
@@ -446,16 +437,6 @@ msgstr "Impostos"
 msgid "Template"
 msgstr "Modelos"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-"O modelo selecionado (%s) não está na mesma empresa (%s) do utilizador atual "
-"(%s)."
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -482,6 +463,7 @@ msgid "User input"
 msgstr "Entrada do utilizador"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -508,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr "Assistente para gerar movimentos a partir do modelo"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -529,6 +512,7 @@ msgstr ""
 "i> para linha com sequência = 1. Exemplos:"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -539,3 +523,55 @@ msgstr ""
 "Apagou uma linha no assistente. Não é permitido: deve em alternativa "
 "atualizar o modelo ou modificar o movimento de diário que será gerado pelo "
 "assistente."
+
+#~ msgid "Analytic Account"
+#~ msgstr "Conta Analítica"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "Etiquetas Analíticas"
+
+#~ msgid "Archive"
+#~ msgstr "Arquivar"
+
+#~ msgid "Compute Formula"
+#~ msgstr "Calcular Fórmula"
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s). "
+#~ "Check that the lines used in the formula really exists and have a lower "
+#~ "sequence than the current line."
+#~ msgstr ""
+#~ "Impossível calcular a fórmula da linha com sequência %s (formula: %s). "
+#~ "Verifique que as linhas usadas na formula existem de facto e têm "
+#~ "sequência mais baixa que a linha atual."
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s): "
+#~ "the syntax of the formula is wrong."
+#~ msgstr ""
+#~ "Impossível calculara a f´rmula da linha com a sequência%s (formula: %s): "
+#~ "a sintaxe da fórmula está errada."
+
+#, python-format
+#~ msgid ""
+#~ "Invalid dictionary: {}\n"
+#~ "{}"
+#~ msgstr ""
+#~ "Dicionário inválido: {}\n"
+#~ "{}"
+
+#~ msgid "Python Code"
+#~ msgstr "Código Python"
+
+#~ msgid "Restore"
+#~ msgstr "Restaurar"
+
+#, python-format
+#~ msgid ""
+#~ "The selected template (%s) is not in the same company (%s) as the current "
+#~ "user (%s)."
+#~ msgstr ""
+#~ "O modelo selecionado (%s) não está na mesma empresa (%s) do utilizador "
+#~ "atual (%s)."
diff --git a/account_move_template/i18n/pt_BR.po b/account_move_template/i18n/pt_BR.po
index b903df43..95cffd46 100644
--- a/account_move_template/i18n/pt_BR.po
+++ b/account_move_template/i18n/pt_BR.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2023-07-01 23:09+0000\n"
 "Last-Translator: Adriano Prado <adrianojprado@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/"
-"23907/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (cópia)"
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -59,31 +65,26 @@ msgstr "Ativo"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Valor"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "Analítico"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "Conta Analítica"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "Etiquetas Analíticas"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
-msgstr "Arquivar"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
+msgstr ""
 
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
@@ -110,11 +111,6 @@ msgstr "Empresa"
 msgid "Company Currency"
 msgstr "Moeda da Empresa"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "Fórmula do Cálculo"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr "Débito"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Nome para Mostrar"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "Lançamento do modelo %s"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,36 +207,32 @@ msgid "ID"
 msgstr "Identificação"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
-"Impossível calcular a fórmula da linha da sequência %s (fórmula: %s). "
-"Verifique as linhas utilizadas na fórmula realmente existem e possuem uma "
-"sequência menor do que a linha atual."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
-"Impossível calcular a fórmula da linha da sequência %s (fórmula: %s): a "
-"sintaxe da fórmula está incorreta."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
-"Dicionário inválido: {}\n"
-"{}"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__is_refund
@@ -273,6 +272,7 @@ msgid "Journal Item Template"
 msgstr "Modelo de Item de Diário"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -367,6 +367,7 @@ msgid "Overwrite"
 msgstr "Sobrescrever"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -385,11 +386,7 @@ msgid "Payment Terms"
 msgstr "Condição de Pagamento"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr "Código Python"
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -402,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr "Referência"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr "Restaurar"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -437,7 +429,6 @@ msgstr "Linha de Repartição de Impostos"
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr "Impostos"
 
@@ -446,16 +437,6 @@ msgstr "Impostos"
 msgid "Template"
 msgstr "Modelo"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-"O modelo selecionado (%s) não é da mesma empresa (%s) como o atual usuário "
-"(%s)."
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -482,6 +463,7 @@ msgid "User input"
 msgstr "Entrada do usuário"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -508,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr "Wizard para gerar lançamento pelo modelo"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -529,6 +512,7 @@ msgstr ""
 "<i>L1</i> para linha com a sequência = 1. Exemplos:"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -538,3 +522,55 @@ msgid ""
 msgstr ""
 "Você deletou uma linha no wizard. Isto não é permitido: você deve atualizar "
 "o modelo ou modificar o lançamento de diário que será gerado por este wizard."
+
+#~ msgid "Analytic Account"
+#~ msgstr "Conta Analítica"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "Etiquetas Analíticas"
+
+#~ msgid "Archive"
+#~ msgstr "Arquivar"
+
+#~ msgid "Compute Formula"
+#~ msgstr "Fórmula do Cálculo"
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s). "
+#~ "Check that the lines used in the formula really exists and have a lower "
+#~ "sequence than the current line."
+#~ msgstr ""
+#~ "Impossível calcular a fórmula da linha da sequência %s (fórmula: %s). "
+#~ "Verifique as linhas utilizadas na fórmula realmente existem e possuem uma "
+#~ "sequência menor do que a linha atual."
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s): "
+#~ "the syntax of the formula is wrong."
+#~ msgstr ""
+#~ "Impossível calcular a fórmula da linha da sequência %s (fórmula: %s): a "
+#~ "sintaxe da fórmula está incorreta."
+
+#, python-format
+#~ msgid ""
+#~ "Invalid dictionary: {}\n"
+#~ "{}"
+#~ msgstr ""
+#~ "Dicionário inválido: {}\n"
+#~ "{}"
+
+#~ msgid "Python Code"
+#~ msgstr "Código Python"
+
+#~ msgid "Restore"
+#~ msgstr "Restaurar"
+
+#, python-format
+#~ msgid ""
+#~ "The selected template (%s) is not in the same company (%s) as the current "
+#~ "user (%s)."
+#~ msgstr ""
+#~ "O modelo selecionado (%s) não é da mesma empresa (%s) como o atual "
+#~ "usuário (%s)."
diff --git a/account_move_template/i18n/pt_PT.po b/account_move_template/i18n/pt_PT.po
index 9a5d5c59..de501e8d 100644
--- a/account_move_template/i18n/pt_PT.po
+++ b/account_move_template/i18n/pt_PT.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -59,30 +65,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Valor"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -110,11 +111,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -166,6 +162,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -186,11 +183,17 @@ msgid "Display Name"
 msgstr "Nome a exibir"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -205,28 +208,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -267,6 +273,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/ro.po b/account_move_template/i18n/ro.po
index 0fd51ba6..5a810686 100644
--- a/account_move_template/i18n/ro.po
+++ b/account_move_template/i18n/ro.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Nume Afişat"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/ru.po b/account_move_template/i18n/ru.po
index e56b73b3..b23b6289 100644
--- a/account_move_template/i18n/ru.po
+++ b/account_move_template/i18n/ru.po
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -59,30 +65,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -110,11 +111,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -166,6 +162,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -186,11 +183,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -205,28 +208,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -267,6 +273,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -362,6 +369,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -380,11 +388,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -396,11 +400,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -431,7 +430,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -440,14 +438,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -474,6 +464,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -500,6 +491,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -516,6 +508,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/sk.po b/account_move_template/i18n/sk.po
index 4a450241..fa7436ac 100644
--- a/account_move_template/i18n/sk.po
+++ b/account_move_template/i18n/sk.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Zobraziť meno"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -359,6 +366,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -377,11 +385,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -393,11 +397,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -428,7 +427,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -437,14 +435,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -471,6 +461,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -497,6 +488,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -513,6 +505,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/sl.po b/account_move_template/i18n/sl.po
index 251b85b6..1465b42b 100644
--- a/account_move_template/i18n/sl.po
+++ b/account_move_template/i18n/sl.po
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -60,30 +66,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Znesek"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -111,11 +112,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -167,6 +163,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -187,11 +184,17 @@ msgid "Display Name"
 msgstr "Prikazani naziv"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -206,28 +209,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -268,6 +274,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -363,6 +370,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -381,11 +389,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -397,11 +401,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -432,7 +431,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -441,14 +439,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -475,6 +465,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -501,6 +492,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -517,6 +509,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/sr.po b/account_move_template/i18n/sr.po
index bc5a2efe..76d3d769 100644
--- a/account_move_template/i18n/sr.po
+++ b/account_move_template/i18n/sr.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/sr@latin.po b/account_move_template/i18n/sr@latin.po
index 426503a2..08faf0be 100644
--- a/account_move_template/i18n/sr@latin.po
+++ b/account_move_template/i18n/sr@latin.po
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -59,30 +65,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -110,11 +111,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -166,6 +162,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -186,11 +183,17 @@ msgid "Display Name"
 msgstr "Ime za prikaz"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -205,28 +208,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -267,6 +273,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -362,6 +369,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -380,11 +388,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -396,11 +400,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -431,7 +430,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -440,14 +438,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -474,6 +464,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -500,6 +491,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -516,6 +508,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/sv.po b/account_move_template/i18n/sv.po
index a14466d9..8f242e35 100644
--- a/account_move_template/i18n/sv.po
+++ b/account_move_template/i18n/sv.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (kopia)"
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,31 +64,26 @@ msgstr "Aktiv"
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Belopp"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "Objekt"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "Objektkonto"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "Objektetiketter"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
-msgstr "Arkivera"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
+msgstr ""
 
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
@@ -109,11 +110,6 @@ msgstr "Bolag"
 msgid "Company Currency"
 msgstr "Bolagets valuta"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "Beräkna formel"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr "Debet"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Visa namn"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "Verifikat från mall %s"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,33 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
-"Det är omöjligt att beräkna formeln för raden med sekvens %s (formel: %s). "
-"Kontrollera att raderna som används i formeln verkligen finns och att de har "
-"en lägre sekvens än den aktuella raden."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
-"Det är omöjligt att beräkna formeln för raden med sekvens %s (formula: %s): "
-"formelns syntax är fel."
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -270,6 +271,7 @@ msgid "Journal Item Template"
 msgstr "Verifikatradsmall"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -365,6 +367,7 @@ msgid "Overwrite"
 msgstr "Skriv över"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -383,11 +386,7 @@ msgid "Payment Terms"
 msgstr "Betalningsvillkor"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr "Pythonkod"
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -399,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr "Referens"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr "Återställ"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -434,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr "Moms"
 
@@ -443,16 +436,6 @@ msgstr "Moms"
 msgid "Template"
 msgstr "Mall"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-"Den valda mallen (%s) tillhör inte samma bolag (%s) som den aktuella "
-"användaren (%s)."
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -479,6 +462,7 @@ msgid "User input"
 msgstr "Inmatning av användaren"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -505,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -522,10 +507,11 @@ msgid ""
 "You can refer to other lines using their sequence number e.g. <i>L1</i> for "
 "line with sequence = 1. Examples:"
 msgstr ""
-"Du kan referera till andra rader genom att använda deras sekvensnummer, "
-"t.ex. <i>L1</i> för raden med sekvens = 1. Exempel:"
+"Du kan referera till andra rader genom att använda deras sekvensnummer, t."
+"ex. <i>L1</i> för raden med sekvens = 1. Exempel:"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -536,3 +522,47 @@ msgstr ""
 "Du tog bort en rad i guiden. Detta är inte tillåtet: du måste antingen "
 "uppdatera mallen eller ändra verifikatet som kommer att genereras av denna "
 "guide."
+
+#~ msgid "Analytic Account"
+#~ msgstr "Objektkonto"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "Objektetiketter"
+
+#~ msgid "Archive"
+#~ msgstr "Arkivera"
+
+#~ msgid "Compute Formula"
+#~ msgstr "Beräkna formel"
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s). "
+#~ "Check that the lines used in the formula really exists and have a lower "
+#~ "sequence than the current line."
+#~ msgstr ""
+#~ "Det är omöjligt att beräkna formeln för raden med sekvens %s (formel: "
+#~ "%s). Kontrollera att raderna som används i formeln verkligen finns och "
+#~ "att de har en lägre sekvens än den aktuella raden."
+
+#, python-format
+#~ msgid ""
+#~ "Impossible to compute the formula of line with sequence %s (formula: %s): "
+#~ "the syntax of the formula is wrong."
+#~ msgstr ""
+#~ "Det är omöjligt att beräkna formeln för raden med sekvens %s (formula: "
+#~ "%s): formelns syntax är fel."
+
+#~ msgid "Python Code"
+#~ msgstr "Pythonkod"
+
+#~ msgid "Restore"
+#~ msgstr "Återställ"
+
+#, python-format
+#~ msgid ""
+#~ "The selected template (%s) is not in the same company (%s) as the current "
+#~ "user (%s)."
+#~ msgstr ""
+#~ "Den valda mallen (%s) tillhör inte samma bolag (%s) som den aktuella "
+#~ "användaren (%s)."
diff --git a/account_move_template/i18n/th.po b/account_move_template/i18n/th.po
index 7352b11e..92341388 100644
--- a/account_move_template/i18n/th.po
+++ b/account_move_template/i18n/th.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "ชื่อที่ใช้แสดง"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "รหัส"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/tr.po b/account_move_template/i18n/tr.po
index ad83f405..626bc95d 100644
--- a/account_move_template/i18n/tr.po
+++ b/account_move_template/i18n/tr.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Görünen İsim"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/tr_TR.po b/account_move_template/i18n/tr_TR.po
index 9975335c..15408ca8 100644
--- a/account_move_template/i18n/tr_TR.po
+++ b/account_move_template/i18n/tr_TR.po
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -60,30 +66,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "Tutar"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -111,11 +112,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -167,6 +163,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -187,11 +184,17 @@ msgid "Display Name"
 msgstr "Görünen ad"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -206,28 +209,31 @@ msgid "ID"
 msgstr "Kimlik"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -268,6 +274,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -362,6 +369,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -380,11 +388,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -396,11 +400,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -431,7 +430,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -440,14 +438,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -474,6 +464,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -500,6 +491,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -516,6 +508,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/uk.po b/account_move_template/i18n/uk.po
index c8cc08f6..b264be24 100644
--- a/account_move_template/i18n/uk.po
+++ b/account_move_template/i18n/uk.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "Назва для відображення"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/vi.po b/account_move_template/i18n/vi.po
index 61db105b..74c600e8 100644
--- a/account_move_template/i18n/vi.po
+++ b/account_move_template/i18n/vi.po
@@ -29,11 +29,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -57,30 +63,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -108,11 +109,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -164,6 +160,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -184,11 +181,17 @@ msgid "Display Name"
 msgstr "Tên hiển thị"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -203,28 +206,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -265,6 +271,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/vi_VN.po b/account_move_template/i18n/vi_VN.po
index af427fa1..18747425 100644
--- a/account_move_template/i18n/vi_VN.po
+++ b/account_move_template/i18n/vi_VN.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -438,14 +436,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -514,6 +506,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
diff --git a/account_move_template/i18n/zh_CN.po b/account_move_template/i18n/zh_CN.po
index 78b36d3e..afa4d532 100644
--- a/account_move_template/i18n/zh_CN.po
+++ b/account_move_template/i18n/zh_CN.po
@@ -31,11 +31,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -59,30 +65,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr "金额"
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr "辅助核算"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
-msgstr "辅助核算项"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr "辅助核算标签"
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -110,11 +111,6 @@ msgstr "核算组织"
 msgid "Company Currency"
 msgstr "本位币"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr "计算公式"
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr "借"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "显示名称"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr "从模式凭证 %s 引入"
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr "分录模板"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -360,6 +367,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -378,11 +386,7 @@ msgid "Payment Terms"
 msgstr "收付款条件"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr "Python 代码"
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -394,11 +398,6 @@ msgstr ""
 msgid "Reference"
 msgstr "单据编号"
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -429,7 +428,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr "税金"
 
@@ -438,14 +436,6 @@ msgstr "税金"
 msgid "Template"
 msgstr "模式凭证"
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -472,6 +462,7 @@ msgid "User input"
 msgstr "用户输入"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -498,6 +489,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -516,6 +508,7 @@ msgstr ""
 "例："
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -523,3 +516,15 @@ msgid ""
 "update the template or modify the journal entry that will be generated by "
 "this wizard."
 msgstr ""
+
+#~ msgid "Analytic Account"
+#~ msgstr "辅助核算项"
+
+#~ msgid "Analytic Tags"
+#~ msgstr "辅助核算标签"
+
+#~ msgid "Compute Formula"
+#~ msgstr "计算公式"
+
+#~ msgid "Python Code"
+#~ msgstr "Python 代码"
diff --git a/account_move_template/i18n/zh_TW.po b/account_move_template/i18n/zh_TW.po
index e62872e6..07140c62 100644
--- a/account_move_template/i18n/zh_TW.po
+++ b/account_move_template/i18n/zh_TW.po
@@ -30,11 +30,17 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "&gt;"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "1250"
@@ -58,30 +64,25 @@ msgstr ""
 
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__amount
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Amount"
 msgstr ""
 
 #. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution
 msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_account_id
-msgid "Analytic Account"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_distribution_search
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_distribution_search
+msgid "Analytic Distribution Search"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_tag_ids
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_tag_ids
-msgid "Analytic Tags"
-msgstr ""
-
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Archive"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__analytic_precision
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__analytic_precision
+msgid "Analytic Precision"
 msgstr ""
 
 #. module: account_move_template
@@ -109,11 +110,6 @@ msgstr ""
 msgid "Company Currency"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
-msgid "Compute Formula"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_line__type__computed
 msgid "Computed"
@@ -165,6 +161,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Debit and credit of all lines are null."
@@ -185,11 +182,17 @@ msgid "Display Name"
 msgstr "顯示名稱"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Entry from template %s"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
+msgid "Formula"
+msgstr ""
+
 #. module: account_move_template
 #: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
 msgid "Generate Journal Entry"
@@ -204,28 +207,31 @@ msgid "ID"
 msgstr "編號"
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s). "
-"Check that the lines used in the formula really exists and have a lower "
-"sequence than the current line."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s). Check that the lines used in the formula really exists "
+"and have a lower sequence than the current line."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
-"Impossible to compute the formula of line with sequence %s (formula: %s): "
-"the syntax of the formula is wrong."
+"Impossible to compute the formula of line with sequence %(sequence)s "
+"(formula: %(code)s): the syntax of the formula is wrong."
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid ""
-"Invalid dictionary: {}\n"
-"{}"
+"Invalid dictionary: %(exception)s\n"
+"%(msg)s"
 msgstr ""
 
 #. module: account_move_template
@@ -266,6 +272,7 @@ msgid "Journal Item Template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Keys must be line sequence, i..e, L1, L2, ..."
@@ -361,6 +368,7 @@ msgid "Overwrite"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Overwrite value must be a valid python dict"
@@ -379,11 +387,7 @@ msgid "Payment Terms"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__python_code
-msgid "Python Code"
-msgstr ""
-
-#. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid "Python Code must be set for computed line with sequence %d."
@@ -395,11 +399,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#. module: account_move_template
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
-msgid "Restore"
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.fields.selection,name:account_move_template.selection__account_move_template_run__state__select_template
 msgid "Select Template"
@@ -430,7 +429,6 @@ msgstr ""
 #. module: account_move_template
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_ids
 #: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_ids
-#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Taxes"
 msgstr ""
 
@@ -439,14 +437,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#. module: account_move_template
-#: code:addons/account_move_template/wizard/account_move_template_run.py:0
-#, python-format
-msgid ""
-"The selected template (%s) is not in the same company (%s) as the current "
-"user (%s)."
-msgstr ""
-
 #. module: account_move_template
 #: model:ir.model.constraint,message:account_move_template.constraint_account_move_template_line_sequence_template_uniq
 msgid "The sequence of the line must be unique per template!"
@@ -473,6 +463,7 @@ msgid "User input"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/wizard/account_move_template_run.py:0
 #, python-format
 msgid "Valid fields to overwrite are %s"
@@ -499,6 +490,7 @@ msgid "Wizard to generate move from template"
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""
@@ -515,6 +507,7 @@ msgid ""
 msgstr ""
 
 #. module: account_move_template
+#. odoo-python
 #: code:addons/account_move_template/models/account_move_template.py:0
 #, python-format
 msgid ""