diff --git a/account_move_template/i18n/account_move_template.pot b/account_move_template/i18n/account_move_template.pot
new file mode 100644
index 000000000..4acd00b89
--- /dev/null
+++ b/account_move_template/i18n/account_move_template.pot
@@ -0,0 +1,418 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* account_move_template
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, 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 "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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
+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 ""
+
+#. 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_run_form
+msgid "Cancel"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
+#: selection:account.move.template.line,type:0
+msgid "Computed"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+msgid "Create Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: account_move_template
+#: selection:account.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
+#. module: account_move_template
+#: selection:account.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
+msgid "ID"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid "Impossible to compute the formula of line with sequence %s (formula: %s): the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal Entry Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Journal Entry Template Line"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
+msgid "Move Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
+msgid "Name"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+msgid "Next"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
+msgid "Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
+msgstr ""
+
+#. module: account_move_template
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: account_move_template
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
+msgid "State"
+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 ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid "The selected template (%s) is not in the same company (%s) as the current user (%s)."
+msgstr ""
+
+#. module: account_move_template
+#: sql_constraint:account.move.template.line:0
+msgid "The sequence of the line must be unique per template!"
+msgstr ""
+
+#. module: account_move_template
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
+msgid "Type"
+msgstr ""
+
+#. 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 ""
+
+#. module: account_move_template
+#: selection:account.move.template.line,type:0
+msgid "User input"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
+#, python-format
+msgid "You added a line in the wizard. This is not allowed: you should either update the template or modify the journal entry that will be generated by this wizard."
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "You can refer to other lines using their sequence number e.g. <i>L1</i> for line with sequence = 1. Examples:"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid "You deleted a line in the wizard. This is not allowed: you should either update the template or modify the journal entry that will be generated by this wizard."
+msgstr ""
+
diff --git a/account_move_template/i18n/am.po b/account_move_template/i18n/am.po
index 6602fc2f9..ff02c2fb8 100644
--- a/account_move_template/i18n/am.po
+++ b/account_move_template/i18n/am.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Amharic (https://www.transifex.com/oca/teams/23907/am/)\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/ar.po b/account_move_template/i18n/ar.po
index 46039eb65..dc9e32088 100644
--- a/account_move_template/i18n/ar.po
+++ b/account_move_template/i18n/ar.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,429 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "إلغاء"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "أنشئ في"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "أنشئ بواسطة"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "أنشئ في"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "اسم العرض"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "المعرف"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "آخر تعديل في"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "آخر تحديث بواسطة"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "آخر تحديث في"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "الاسم"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "الشريك"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "الشريك"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "النوع"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/bg.po b/account_move_template/i18n/bg.po
index 04027efc3..b99f79a85 100644
--- a/account_move_template/i18n/bg.po
+++ b/account_move_template/i18n/bg.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bulgarian (https://www.transifex.com/oca/teams/23907/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Отмяна"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Създадено на"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Създадено от"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Създадено на"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Име за показване"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Последно обновено на"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Последно обновено от"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Последно обновено на"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Вид"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/bs.po b/account_move_template/i18n/bs.po
index 5fd3a0933..ceaf9f958 100644
--- a/account_move_template/i18n/bs.po
+++ b/account_move_template/i18n/bs.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,429 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bosnian (https://www.transifex.com/oca/teams/23907/bs/)\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: bs\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Otkaži"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Kreirano"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Prikaži naziv"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Zadnje mijenjano"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Naziv"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Vrsta"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/ca.po b/account_move_template/i18n/ca.po
index f9607910f..426b3055e 100644
--- a/account_move_template/i18n/ca.po
+++ b/account_move_template/i18n/ca.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creat el"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creat per"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creat el"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Veure el nom"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Darrera modificació el"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Darrera Actualització per"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Darrera Actualització el"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Empresa"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipus"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/ca_ES.po b/account_move_template/i18n/ca_ES.po
index 8bd82e17b..6bc0f7a3c 100644
--- a/account_move_template/i18n/ca_ES.po
+++ b/account_move_template/i18n/ca_ES.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,428 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Catalan (Spain) (https://www.transifex.com/oca/teams/23907/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (https://www.transifex.com/oca/teams/23907/"
+"ca_ES/)\n"
+"Language: ca_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+msgid "Create Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/cs.po b/account_move_template/i18n/cs.po
index 007da7dd8..90c5df880 100644
--- a/account_move_template/i18n/cs.po
+++ b/account_move_template/i18n/cs.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Czech (https://www.transifex.com/oca/teams/23907/cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Zrušit"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Vytvořeno"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Vytvořil(a)"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Vytvořeno"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Zobrazovaný název"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Naposled upraveno"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Naposled upraveno"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Naposled upraveno"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Název"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Společník"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Společník"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Druh"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/da.po b/account_move_template/i18n/da.po
index d1446f5b0..61b15619a 100644
--- a/account_move_template/i18n/da.po
+++ b/account_move_template/i18n/da.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Annuller"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Oprettet den"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Oprettet af"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Oprettet den"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Vist navn"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "Id"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Sidst ændret den"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Sidst opdateret af"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Sidst opdateret den"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Type"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/de.po b/account_move_template/i18n/de.po
index 6460683ed..5afe88677 100644
--- a/account_move_template/i18n/de.po
+++ b/account_move_template/i18n/de.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
@@ -13,330 +13,429 @@ msgstr ""
 "PO-Revision-Date: 2017-12-22 23:21+0000\n"
 "Last-Translator: Rudolf Schnapka <rs@techno-flex.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+#, fuzzy
+msgid "Account"
+msgstr "Betrag"
+
+#. 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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Erstellt am"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Erstellt von"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Erstellt am"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Anzeigename"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Zuletzt geändert am"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Zuletzt geändert von"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Zuletzt geändert am"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Name"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr "Nächster"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Art"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/el_GR.po b/account_move_template/i18n/el_GR.po
index 7dbad6218..c863d4563 100644
--- a/account_move_template/i18n/el_GR.po
+++ b/account_move_template/i18n/el_GR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/"
+"el_GR/)\n"
+"Language: el_GR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Άκυρο"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Δημιουργήθηκε στις"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Δημιουργήθηκε από "
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Δημιουργήθηκε στις"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "Κωδικός"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Τελευταία ενημέρωση από"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Τελευταία ενημέρωση στις"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/en_AU.po b/account_move_template/i18n/en_AU.po
index 6fe1fc81f..296171c30 100644
--- a/account_move_template/i18n/en_AU.po
+++ b/account_move_template/i18n/en_AU.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,428 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: English (Australia) (https://www.transifex.com/oca/teams/23907/en_AU/)\n"
+"Language-Team: English (Australia) (https://www.transifex.com/oca/"
+"teams/23907/en_AU/)\n"
+"Language: en_AU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: en_AU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancel"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+msgid "Create Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/en_GB.po b/account_move_template/i18n/en_GB.po
index c00a9ef05..0dfca4549 100644
--- a/account_move_template/i18n/en_GB.po
+++ b/account_move_template/i18n/en_GB.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/teams/23907/en_GB/)\n"
+"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/"
+"teams/23907/en_GB/)\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancel"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Created on"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Created by"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Created on"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Display Name"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Last Modified on"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Name"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Type"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es.po b/account_move_template/i18n/es.po
index 100c0cdc4..7220a9d37 100644
--- a/account_move_template/i18n/es.po
+++ b/account_move_template/i18n/es.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,430 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+#, fuzzy
+msgid "Account"
+msgstr "Importe"
+
+#. 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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+#, fuzzy
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
-msgstr "Diario"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Última modificación el"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Empresa"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_AR.po b/account_move_template/i18n/es_AR.po
index 8d32c3773..7bbfcdf69 100644
--- a/account_move_template/i18n/es_AR.po
+++ b/account_move_template/i18n/es_AR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\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"
 "Content-Transfer-Encoding: \n"
-"Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Mostrar Nombre"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_CL.po b/account_move_template/i18n/es_CL.po
index b1daa6f16..4e720f125 100644
--- a/account_move_template/i18n/es_CL.po
+++ b/account_move_template/i18n/es_CL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/es_CL/)\n"
+"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/"
+"es_CL/)\n"
+"Language: es_CL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_CO.po b/account_move_template/i18n/es_CO.po
index 176a0d3ce..39d9c3ce6 100644
--- a/account_move_template/i18n/es_CO.po
+++ b/account_move_template/i18n/es_CO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/"
+"es_CO/)\n"
+"Language: es_CO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nombre Público"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Última Modificación el"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Actualizado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Actualizado"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_CR.po b/account_move_template/i18n/es_CR.po
index bf7ddb4dd..9600dae3a 100644
--- a/account_move_template/i18n/es_CR.po
+++ b/account_move_template/i18n/es_CR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/23907/es_CR/)\n"
+"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/"
+"teams/23907/es_CR/)\n"
+"Language: es_CR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Empresa"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_DO.po b/account_move_template/i18n/es_DO.po
index dde8b1ad9..4f3e2abc5 100644
--- a/account_move_template/i18n/es_DO.po
+++ b/account_move_template/i18n/es_DO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/teams/23907/es_DO/)\n"
+"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/"
+"teams/23907/es_DO/)\n"
+"Language: es_DO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_DO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_EC.po b/account_move_template/i18n/es_EC.po
index 763ce4dac..afd75eebe 100644
--- a/account_move_template/i18n/es_EC.po
+++ b/account_move_template/i18n/es_EC.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Cristian Salamea <ovnicraft@gmail.com>, 2017
@@ -12,331 +12,431 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: Cristian Salamea <ovnicraft@gmail.com>, 2017\n"
-"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n"
+"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/"
+"es_EC/)\n"
+"Language: es_EC\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_EC\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+#, fuzzy
+msgid "Account"
+msgstr "Monto"
+
+#. 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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Empresa"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_ES.po b/account_move_template/i18n/es_ES.po
index ecba31ddf..b923dff6c 100644
--- a/account_move_template/i18n/es_ES.po
+++ b/account_move_template/i18n/es_ES.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/es_ES/)\n"
+"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/"
+"es_ES/)\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nombre para mostrar"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_MX.po b/account_move_template/i18n/es_MX.po
index 1793e6eb4..be0de9187 100644
--- a/account_move_template/i18n/es_MX.po
+++ b/account_move_template/i18n/es_MX.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n"
+"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/"
+"es_MX/)\n"
+"Language: es_MX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nombre desplegado"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Ultima modificacion realizada"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualizacion por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización realizada"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nombre"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Empresa"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_PE.po b/account_move_template/i18n/es_PE.po
index f89d7d3a5..9a75301de 100644
--- a/account_move_template/i18n/es_PE.po
+++ b/account_move_template/i18n/es_PE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/es_PE/)\n"
+"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/"
+"es_PE/)\n"
+"Language: es_PE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Ultima Modificación en"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Actualizado última vez por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Ultima Actualización"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_PY.po b/account_move_template/i18n/es_PY.po
index 59bd33527..c25bb0cd2 100644
--- a/account_move_template/i18n/es_PY.po
+++ b/account_move_template/i18n/es_PY.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/es_PY/)\n"
+"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/"
+"es_PY/)\n"
+"Language: es_PY\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_PY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/es_VE.po b/account_move_template/i18n/es_VE.po
index 5211d8ead..569df39f6 100644
--- a/account_move_template/i18n/es_VE.po
+++ b/account_move_template/i18n/es_VE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/23907/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/"
+"teams/23907/es_VE/)\n"
+"Language: es_VE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Modificada por última vez"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualizacion en"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Empresa"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/et.po b/account_move_template/i18n/et.po
index d42ac8406..97e1f7c9d 100644
--- a/account_move_template/i18n/et.po
+++ b/account_move_template/i18n/et.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Estonian (https://www.transifex.com/oca/teams/23907/et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Loobu"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Loodud"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Loonud"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Loodud"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Viimati muudetud"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Viimati uuendatud"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Viimati uuendatud"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nimi"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tüüp"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/eu.po b/account_move_template/i18n/eu.po
index 6f1b455c8..fb39fb233 100644
--- a/account_move_template/i18n/eu.po
+++ b/account_move_template/i18n/eu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Basque (https://www.transifex.com/oca/teams/23907/eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Ezeztatu"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Created on"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Nork sortua"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Created on"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Izena erakutsi"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Mota"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/fa.po b/account_move_template/i18n/fa.po
index 295a81a90..ac47530a5 100644
--- a/account_move_template/i18n/fa.po
+++ b/account_move_template/i18n/fa.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Persian (https://www.transifex.com/oca/teams/23907/fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "لغو"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "ایجاد شده در"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "ایجاد شده توسط"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "ایجاد شده در"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "نام نمایشی"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "شناسه"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "تاریخ آخرین به‌روزرسانی"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "آخرین به روز رسانی توسط"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "آخرین به روز رسانی در"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "نوع"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/fi.po b/account_move_template/i18n/fi.po
index a32c64922..15ea0e73f 100644
--- a/account_move_template/i18n/fi.po
+++ b/account_move_template/i18n/fi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Peruuta"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Luotu"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Luonut"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Luotu"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nimi"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Viimeksi muokattu"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Viimeksi päivittänyt"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Viimeksi päivitetty"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tyyppi"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/fr.po b/account_move_template/i18n/fr.po
index 22a614656..ffc5b5c1c 100644
--- a/account_move_template/i18n/fr.po
+++ b/account_move_template/i18n/fr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,429 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+#, fuzzy
+msgid "Account"
+msgstr "Montant"
+
+#. 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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Annuler"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Créé le"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Afficher le nom"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Dernière Modification le"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nom"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partenaire"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partenaire"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr "État"
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Type"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/fr_CA.po b/account_move_template/i18n/fr_CA.po
index 5dec9f7bc..51a3ed28e 100644
--- a/account_move_template/i18n/fr_CA.po
+++ b/account_move_template/i18n/fr_CA.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/fr_CA/)\n"
+"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/"
+"fr_CA/)\n"
+"Language: fr_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Annuler"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Créé le"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Afficher le nom"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "Identifiant"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/fr_CH.po b/account_move_template/i18n/fr_CH.po
index 442b6bd6f..b28a82021 100644
--- a/account_move_template/i18n/fr_CH.po
+++ b/account_move_template/i18n/fr_CH.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: French (Switzerland) (https://www.transifex.com/oca/teams/23907/fr_CH/)\n"
+"Language-Team: French (Switzerland) (https://www.transifex.com/oca/"
+"teams/23907/fr_CH/)\n"
+"Language: fr_CH\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr_CH\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Annuler"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Créé le"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Modifié par"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Modifié le"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/fr_FR.po b/account_move_template/i18n/fr_FR.po
index c4a3cae95..6edc47116 100644
--- a/account_move_template/i18n/fr_FR.po
+++ b/account_move_template/i18n/fr_FR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,428 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: French (France) (https://www.transifex.com/oca/teams/23907/fr_FR/)\n"
+"Language-Team: French (France) (https://www.transifex.com/oca/teams/23907/"
+"fr_FR/)\n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr_FR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Annuler"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+msgid "Create Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/gl.po b/account_move_template/i18n/gl.po
index 8b9c3a6f3..5cd8b2749 100644
--- a/account_move_template/i18n/gl.po
+++ b/account_move_template/i18n/gl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creado en"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Última modificación"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "ültima actualización por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/gl_ES.po b/account_move_template/i18n/gl_ES.po
index 303409948..74a7636c0 100644
--- a/account_move_template/i18n/gl_ES.po
+++ b/account_move_template/i18n/gl_ES.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,428 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Galician (Spain) (https://www.transifex.com/oca/teams/23907/gl_ES/)\n"
+"Language-Team: Galician (Spain) (https://www.transifex.com/oca/teams/23907/"
+"gl_ES/)\n"
+"Language: gl_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gl_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+msgid "Create Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/gu.po b/account_move_template/i18n/gu.po
index 603973735..a27a33b38 100644
--- a/account_move_template/i18n/gu.po
+++ b/account_move_template/i18n/gu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,426 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Gujarati (https://www.transifex.com/oca/teams/23907/gu/)\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "રદ કરો"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+msgid "Create Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ઓળખ"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/he.po b/account_move_template/i18n/he.po
index dbf3f7fe1..4474c7863 100644
--- a/account_move_template/i18n/he.po
+++ b/account_move_template/i18n/he.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hebrew (https://www.transifex.com/oca/teams/23907/he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "בטל"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "נוצר ב-"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "נוצר על ידי"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "נוצר ב-"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "השם המוצג"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "מזהה"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "תאריך שינוי אחרון"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "עודכן לאחרונה על ידי"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "עודכן לאחרונה על"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "סוג"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/hi.po b/account_move_template/i18n/hi.po
index cfaa83139..966520023 100644
--- a/account_move_template/i18n/hi.po
+++ b/account_move_template/i18n/hi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,426 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hindi (https://www.transifex.com/oca/teams/23907/hi/)\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "रद्द"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+msgid "Create Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/hr.po b/account_move_template/i18n/hr.po
index c938f4f10..5b409a9a2 100644
--- a/account_move_template/i18n/hr.po
+++ b/account_move_template/i18n/hr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Bole <bole@dajmi5.com>, 2017
@@ -13,330 +13,471 @@ msgstr ""
 "PO-Revision-Date: 2018-02-23 01:41+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, 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 "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+#, fuzzy
+msgid "Account"
 msgstr "ID Konta"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: 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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+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
+#, fuzzy
+msgid "Analytic Account"
 msgstr "ID Analitičkog konta"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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
+#, fuzzy
+msgid "Analytic Tags"
+msgstr "ID Analitičkog konta"
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Cancel"
 msgstr "Odustani"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+#, fuzzy
+msgid "Company"
 msgstr "ID Tvrtke"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+#, fuzzy
+msgid "Company Currency"
+msgstr "ID Tvrtke"
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+#, fuzzy
+msgid "Compute Formula"
+msgstr "Izračunato"
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr "Izračunato"
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+#, fuzzy
+msgid "Create Entry from Template"
 msgstr "Kreiraj temeljnicu iz predloška"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Kreirano"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Prikaži ime"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+#, fuzzy
+msgid "Journal"
+msgstr "ID Dnevnika"
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
-msgstr "ID Dnevnika"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+#, fuzzy
+msgid "Journal Item Template"
+msgstr "Kreiraj temeljnicu iz predloška"
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Zadnja izmjena dana"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano dana"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+#, fuzzy
+msgid "Lines"
 msgstr "Stavke"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr "Učitaj"
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Naziv"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr "Sljedeći"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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 Code"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: 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
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
+msgstr ""
+
+#. module: account_move_template
+#: selection:account.move.template.run,state:0
+#, fuzzy
+msgid "Select Template"
+msgstr "Test predloška"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr "Sekvenca"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+#, fuzzy
+msgid "Set Lines"
+msgstr "Stavke predloška"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr "Stanje"
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
-msgstr "Stavke predloška"
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
-msgstr "ID predloška"
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr "IDovi stavaka predloška"
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr "Predložak odabran"
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
-msgstr "Test predloška"
-
-#. module: account_move_template
-#: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+#, fuzzy
+msgid "Template"
+msgstr "ID predloška"
+
+#. module: account_move_template
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
+msgstr ""
+
+#. module: account_move_template
+#: sql_constraint:account.move.template.line:0
+msgid "The sequence of the line must be unique per template!"
+msgstr ""
+
+#. module: account_move_template
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tip"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+#, fuzzy
+msgid "Wizard Lines to generate move from template"
+msgstr "Kreiraj temeljnicu iz predloška"
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+#, fuzzy
+msgid "Wizard to generate move from template"
+msgstr "Kreiraj temeljnicu iz predloška"
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr "account.document.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
+msgstr ""
 
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr "account.document.template.line"
+#~ msgid "Load"
+#~ msgstr "Učitaj"
 
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr "account.move.template"
+#~ msgid "Python code"
+#~ msgstr "Python code"
 
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr "account.move.template.line"
+#~ msgid "Template line ids"
+#~ msgstr "IDovi stavaka predloška"
 
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
-msgstr "wizard.select.move.template"
+#~ msgid "Template selected"
+#~ msgstr "Predložak odabran"
+
+#~ msgid "account.document.template"
+#~ msgstr "account.document.template"
+
+#~ msgid "account.document.template.line"
+#~ msgstr "account.document.template.line"
+
+#~ msgid "account.move.template"
+#~ msgstr "account.move.template"
+
+#~ msgid "account.move.template.line"
+#~ msgstr "account.move.template.line"
+
+#~ msgid "wizard.select.move.template"
+#~ msgstr "wizard.select.move.template"
diff --git a/account_move_template/i18n/hr_HR.po b/account_move_template/i18n/hr_HR.po
index b12ee982e..bd39a040d 100644
--- a/account_move_template/i18n/hr_HR.po
+++ b/account_move_template/i18n/hr_HR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Bole <bole@dajmi5.com>, 2017
@@ -12,331 +12,431 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
-"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
+"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/"
+"hr_HR/)\n"
+"Language: hr_HR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr_HR\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Otkaži"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Kreirano"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Naziv"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Zadnje modificirano"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/hu.po b/account_move_template/i18n/hu.po
index abf9fca4a..edf7a26f1 100644
--- a/account_move_template/i18n/hu.po
+++ b/account_move_template/i18n/hu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Mégsem"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Létrehozás dátuma"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Készítette"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Létrehozás dátuma"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Név megjelenítése"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Utolsó frissítés dátuma"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Utoljára frissítve, által"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Utoljára frissítve "
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Név"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Típus"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/id.po b/account_move_template/i18n/id.po
index 41ebe24c6..69f430a46 100644
--- a/account_move_template/i18n/id.po
+++ b/account_move_template/i18n/id.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Indonesian (https://www.transifex.com/oca/teams/23907/id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Batalkan"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Dibuat pada"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Dibuat oleh"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Dibuat pada"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Terakhir Dimodifikasi pada"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Diperbaharui oleh"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Diperbaharui pada"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nama"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Jenis"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/it.po b/account_move_template/i18n/it.po
index 9ce419760..1214c6029 100644
--- a/account_move_template/i18n/it.po
+++ b/account_move_template/i18n/it.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,429 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+#, fuzzy
+msgid "Account"
+msgstr "Importo"
+
+#. 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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Annulla"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creato il"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creato da"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creato il"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nome da visualizzare"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Ultima modifica il"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nome"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/ja.po b/account_move_template/i18n/ja.po
index aee3ee3c0..f2378894c 100644
--- a/account_move_template/i18n/ja.po
+++ b/account_move_template/i18n/ja.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Japanese (https://www.transifex.com/oca/teams/23907/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "キャンセル"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "作成日"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "作成者"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "作成日"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "表示名"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "最終更新日"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "最終更新者"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "最終更新日"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "名前"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "パートナ"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "パートナ"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "タイプ"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/ko.po b/account_move_template/i18n/ko.po
index 5382cead2..9ab980f6f 100644
--- a/account_move_template/i18n/ko.po
+++ b/account_move_template/i18n/ko.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Korean (https://www.transifex.com/oca/teams/23907/ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "취소"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "작성일"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "작성자"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "작성일"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "표시 이름"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "최근 수정"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "최근 갱신한 사람"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "최근 갱신 날짜"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "유형"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/lo.po b/account_move_template/i18n/lo.po
index 9bf5f3797..57cf583b1 100644
--- a/account_move_template/i18n/lo.po
+++ b/account_move_template/i18n/lo.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,426 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Lao (https://www.transifex.com/oca/teams/23907/lo/)\n"
+"Language: lo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "ຍົກເລີອກ"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+msgid "Create Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/lt.po b/account_move_template/i18n/lt.po
index 760cbdee1..834d6bf05 100644
--- a/account_move_template/i18n/lt.po
+++ b/account_move_template/i18n/lt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Viktoras Norkus <viktoras@bmx.lt>, 2018
@@ -13,330 +13,429 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: Viktoras Norkus <viktoras@bmx.lt>, 2018\n"
 "Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Atšaukti"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Sukurta"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Vaizduojamas pavadinimas"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Paskutinį kartą keista"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Paskutinį kartą atnaujino"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Pavadinimas"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partneris"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partneris"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr "Statusas"
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipas"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/lt_LT.po b/account_move_template/i18n/lt_LT.po
index 58369be7f..5fe108398 100644
--- a/account_move_template/i18n/lt_LT.po
+++ b/account_move_template/i18n/lt_LT.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/teams/23907/lt_LT/)\n"
+"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/"
+"teams/23907/lt_LT/)\n"
+"Language: lt_LT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lt_LT\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Atšaukti"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Sukurta"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Paskutinį kartą atnaujino"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/lv.po b/account_move_template/i18n/lv.po
index b40b64b6d..cc3157add 100644
--- a/account_move_template/i18n/lv.po
+++ b/account_move_template/i18n/lv.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/oca/teams/23907/lv/)\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Atcelt"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Izveidots"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Izveidoja"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Izveidots"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Pēdējo reizi atjaunoja"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Pēdējās izmaiņas"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tips"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/mk.po b/account_move_template/i18n/mk.po
index acd885a57..b3be59b1c 100644
--- a/account_move_template/i18n/mk.po
+++ b/account_move_template/i18n/mk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Macedonian (https://www.transifex.com/oca/teams/23907/mk/)\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Откажи"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Креирано на"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Креирано од"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Креирано на"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Прикажи име"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Последна промена на"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Последно ажурирање од"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Последно ажурирање на"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Име"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Партнер"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Партнер"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Тип"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/mn.po b/account_move_template/i18n/mn.po
index 4cc9a02ec..7f782b3d0 100644
--- a/account_move_template/i18n/mn.po
+++ b/account_move_template/i18n/mn.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Mongolian (https://www.transifex.com/oca/teams/23907/mn/)\n"
+"Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Цуцлах"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Үүсгэсэн"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Үүсгэгч"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Үүсгэсэн"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Дэлгэцийн Нэр"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Сүүлийн засвар хийсэн"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Нэр"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Харилцагч"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Төрөл"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/nb.po b/account_move_template/i18n/nb.po
index bd1f15238..4b4bf16a9 100644
--- a/account_move_template/i18n/nb.po
+++ b/account_move_template/i18n/nb.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/nb/)\n"
+"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/"
+"nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Opprettet den"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Opprettet av"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Opprettet den"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Visnings navn"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Sist oppdatert "
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Navn"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Type"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/nb_NO.po b/account_move_template/i18n/nb_NO.po
index faeabc346..fba335aba 100644
--- a/account_move_template/i18n/nb_NO.po
+++ b/account_move_template/i18n/nb_NO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n"
+"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/"
+"teams/23907/nb_NO/)\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Lukk"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Laget den"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Laget av"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Laget den"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Vis navn"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Sist endret den"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert den"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/nl.po b/account_move_template/i18n/nl.po
index a3256e160..1d4cac040 100644
--- a/account_move_template/i18n/nl.po
+++ b/account_move_template/i18n/nl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Frank Schellenberg <opensource@schellenberg.nl>, 2018
@@ -13,330 +13,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: Frank Schellenberg <opensource@schellenberg.nl>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Aangemaakt op"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Te tonen naam"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Naam"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Relatie"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Relatie"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr "Status"
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Type"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/nl_BE.po b/account_move_template/i18n/nl_BE.po
index 401fc3cbb..7bd66023d 100644
--- a/account_move_template/i18n/nl_BE.po
+++ b/account_move_template/i18n/nl_BE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/"
+"nl_BE/)\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Gemaakt op"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Gemaakt door"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Gemaakt op"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Schermnaam"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Laatst Aangepast op"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Naam"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Relatie"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Relatie"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Type"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/nl_NL.po b/account_move_template/i18n/nl_NL.po
index 09fb980db..d670c7a32 100644
--- a/account_move_template/i18n/nl_NL.po
+++ b/account_move_template/i18n/nl_NL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # Frank Schellenberg <opensource@schellenberg.nl>, 2018
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-01-25 11:47+0000\n"
 "PO-Revision-Date: 2018-01-25 11:47+0000\n"
 "Last-Translator: Frank Schellenberg <opensource@schellenberg.nl>, 2018\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
+"teams/23907/nl_NL/)\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Aangemaakt op"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Te tonen naam"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Naam"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Relatie"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Relatie"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr "Status"
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/pl.po b/account_move_template/i18n/pl.po
index a3d6fb711..056514fc2 100644
--- a/account_move_template/i18n/pl.po
+++ b/account_move_template/i18n/pl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,430 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
+"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
+"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Utworzono"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Utworzone przez"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Utworzono"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Wyświetlana nazwa "
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Ostatnio modyfikowano"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Ostatnio modyfikowane przez"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Ostatnia zmiana"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Typ"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/pt.po b/account_move_template/i18n/pt.po
index d7a3b7993..b192dd3bf 100644
--- a/account_move_template/i18n/pt.po
+++ b/account_move_template/i18n/pt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Pedro Castro Silva <pedrocs@exo.pt>, 2017
@@ -13,330 +13,430 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: Pedro Castro Silva <pedrocs@exo.pt>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+#, fuzzy
+msgid "Account"
+msgstr "Montante"
+
+#. 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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Criado em"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nome"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+#, fuzzy
+msgid "Journal"
+msgstr "Id do Diário"
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
-msgstr "Id do Diário"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
+msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação Em"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Atualizado pela última vez por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nome"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Parceiro"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Parceiro"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/pt_BR.po b/account_move_template/i18n/pt_BR.po
index 4ffee2acd..4f8bdcde1 100644
--- a/account_move_template/i18n/pt_BR.po
+++ b/account_move_template/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\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"
 "Content-Transfer-Encoding: \n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Criado em"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nome para Mostrar"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "Identificação"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Última atualização em"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Última atualização por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Última atualização em"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nome"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Parceiro"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Parceiro"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/pt_PT.po b/account_move_template/i18n/pt_PT.po
index b70eec3c2..796dea9c5 100644
--- a/account_move_template/i18n/pt_PT.po
+++ b/account_move_template/i18n/pt_PT.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
+"teams/23907/pt_PT/)\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+#, fuzzy
+msgid "Account"
+msgstr "Valor"
+
+#. 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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Criado em"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Criado em"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nome a exibir"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Modificado pela última vez em"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Atualizado pela última vez por"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nome"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/ro.po b/account_move_template/i18n/ro.po
index 3407ed0ed..2c07b2599 100644
--- a/account_move_template/i18n/ro.po
+++ b/account_move_template/i18n/ro.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,429 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Anuleaza"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Creat la"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Creat de"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Creat la"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Nume Afişat"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Ultima actualizare în"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualizare făcută de"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualizare la"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Nume"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partener"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partener"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/ru.po b/account_move_template/i18n/ru.po
index 86e3d10a6..51dbe88f5 100644
--- a/account_move_template/i18n/ru.po
+++ b/account_move_template/i18n/ru.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,430 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Отменена"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Создан"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Создано"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Создан"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Последний раз обновлено"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Последний раз обновлено"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Название"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Контрагент"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Контрагент"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/sk.po b/account_move_template/i18n/sk.po
index e84f424c0..04739c896 100644
--- a/account_move_template/i18n/sk.po
+++ b/account_move_template/i18n/sk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,427 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovak (https://www.transifex.com/oca/teams/23907/sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Zrušiť"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Vytvorené"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Vytvoril"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Vytvorené"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Posledná modifikácia"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Naposledy upravil"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Naposledy upravené"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Typ"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/sl.po b/account_move_template/i18n/sl.po
index 6ad19112a..cd7ce6955 100644
--- a/account_move_template/i18n/sl.po
+++ b/account_move_template/i18n/sl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,430 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+#, fuzzy
+msgid "Account"
+msgstr "Znesek"
+
+#. 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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Preklic"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Ustvarjeno"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Ustvaril"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Ustvarjeno"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Prikazni naziv"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Zadnjič spremenjeno"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Zadnjič posodobil"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Zadnjič posodobljeno"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Naziv"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tip"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/sr.po b/account_move_template/i18n/sr.po
index bbf37dd9f..37f5adc84 100644
--- a/account_move_template/i18n/sr.po
+++ b/account_move_template/i18n/sr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Serbian (https://www.transifex.com/oca/teams/23907/sr/)\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Otkaži"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Kreiran"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Kreiran"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tip"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/sr@latin.po b/account_move_template/i18n/sr@latin.po
index 5bd32921b..1e5527fea 100644
--- a/account_move_template/i18n/sr@latin.po
+++ b/account_move_template/i18n/sr@latin.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,431 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/sr%40latin/)\n"
+"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/sr"
+"%40latin/)\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Otkaži"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Kreiran"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Kreiran"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Ime za prikaz"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Zadnja izmjena"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Zadnja izmjena"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Zadnja izmjena"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Partner"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tip"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/sv.po b/account_move_template/i18n/sv.po
index 338d36e20..f8ff41e9f 100644
--- a/account_move_template/i18n/sv.po
+++ b/account_move_template/i18n/sv.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/oca/teams/23907/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Skapad den"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Skapad av"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Skapad den"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Visa namn"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Senast redigerad"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Senast uppdaterad av"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Senast uppdaterad"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Namn"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Företag"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Företag"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Typ"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/th.po b/account_move_template/i18n/th.po
index 5cf71c573..6426bd247 100644
--- a/account_move_template/i18n/th.po
+++ b/account_move_template/i18n/th.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Thai (https://www.transifex.com/oca/teams/23907/th/)\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "ยกเลิก"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "สร้างเมื่อ"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "สร้างโดย"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "สร้างเมื่อ"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "ชื่อที่ใช้แสดง"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "รหัส"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "แก้ไขครั้งสุดท้ายเมื่อ"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "อัพเดทครั้งสุดท้ายโดย"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "ชื่อ"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "พาร์ทเนอร์"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "พาร์ทเนอร์"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "ชนิด"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/tr.po b/account_move_template/i18n/tr.po
index a2a69a726..4a5e68c35 100644
--- a/account_move_template/i18n/tr.po
+++ b/account_move_template/i18n/tr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Vazgeç"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Oluşturuldu"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Oluşturuldu"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Görünen İsim"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Son değişiklik"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Son güncelleyen"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Son güncelleme"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Adı"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Cari"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Cari"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tipi"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/tr_TR.po b/account_move_template/i18n/tr_TR.po
index 957789286..6479689aa 100644
--- a/account_move_template/i18n/tr_TR.po
+++ b/account_move_template/i18n/tr_TR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Ediz Duman <neps1192@gmail.com>, 2017
@@ -12,331 +12,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>, 2017\n"
-"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/"
+"tr_TR/)\n"
+"Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr_TR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+#, fuzzy
+msgid "Account"
+msgstr "Tutar"
+
+#. 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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "İptal et"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Oluşturulma tarihi"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Oluşturulma tarihi"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Görünen ad"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "Kimlik"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "En son güncelleme tarihi"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "En son güncelleyen "
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "En son güncelleme tarihi"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "Adı"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Tip"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/uk.po b/account_move_template/i18n/uk.po
index 5f45aa4c6..9ec4b1098 100644
--- a/account_move_template/i18n/uk.po
+++ b/account_move_template/i18n/uk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Ukrainian (https://www.transifex.com/oca/teams/23907/uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Скасувати"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Дата створення"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Створив"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Дата створення"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Назва для відображення"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Остання модифікація"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Востаннє оновив"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Останнє оновлення"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Тип"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/vi.po b/account_move_template/i18n/vi.po
index d9570c6e0..830a40ca1 100644
--- a/account_move_template/i18n/vi.po
+++ b/account_move_template/i18n/vi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,330 +12,428 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Vietnamese (https://www.transifex.com/oca/teams/23907/vi/)\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Được tạo vào"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Được tạo bởi"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Được tạo vào"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Sửa lần cuối vào"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "Đối tác"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "Đối tác"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "Loại"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/vi_VN.po b/account_move_template/i18n/vi_VN.po
index 286525a1d..0bb4f42b8 100644
--- a/account_move_template/i18n/vi_VN.po
+++ b/account_move_template/i18n/vi_VN.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,429 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:24+0000\n"
 "PO-Revision-Date: 2017-11-28 23:24+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/23907/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/"
+"teams/23907/vi_VN/)\n"
+"Language: vi_VN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "Hủy"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "Tạo vào"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "Tạo bởi"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "Tạo vào"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "Cập nhật lần cuối bởi"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+msgid "Override Partner"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr ""
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/zh_CN.po b/account_move_template/i18n/zh_CN.po
index 330420f42..428812fbd 100644
--- a/account_move_template/i18n/zh_CN.po
+++ b/account_move_template/i18n/zh_CN.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/"
+"zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "取消"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "创建时间"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "创建者"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "创建时间"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "Display Name"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "ID"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "Last Modified on"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "最后更新者"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "上次更新日期"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "名称"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "业务伙伴"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "类型"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
diff --git a/account_move_template/i18n/zh_TW.po b/account_move_template/i18n/zh_TW.po
index 86b07a601..6a6e4d348 100644
--- a/account_move_template/i18n/zh_TW.po
+++ b/account_move_template/i18n/zh_TW.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_move_template
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,331 +11,430 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/"
+"zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_account_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_account_id
-msgid "Account id"
+#: code:addons/account_move_template/models/account_move_template.py:33
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_amount
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "1250"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__account_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__account_id
+msgid "Account"
+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:ir.model.fields,field_description:account_move_template.field_account_move_template_line_analytic_account_id
-msgid "Analytic account id"
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "Analytic"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_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 ""
+
+#. 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_run_form
 msgid "Cancel"
 msgstr "刪除"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:57
-#, python-format
-msgid "Code \"%s\" refers to non existing line"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__company_id
+msgid "Company"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_company_id
-msgid "Company id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__company_currency_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__company_currency_id
+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
-#: selection:account.document.template.line,type:0
 #: selection:account.move.template.line,type:0
 msgid "Computed"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move
-#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template
-msgid "Create Move from Template"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_run_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_run_menu
+msgid "Create Entry from Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_uid
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#, fuzzy
+msgid "Create Journal Entry"
+msgstr "建立於"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_uid
 msgid "Created by"
 msgstr "建立者"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_create_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__create_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__create_date
 msgid "Created on"
 msgstr "建立於"
 
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Credit"
 msgstr ""
 
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__date
+msgid "Date"
+msgstr ""
+
 #. module: account_move_template
 #: selection:account.move.template.line,move_line_type:0
-#: selection:wizard.select.move.template.line,move_line_type:0
+#: selection:account.move.template.line.run,move_line_type:0
 msgid "Debit"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_display_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_display_name
+#: code:addons/account_move_template/wizard/account_move_template_run.py:90
+#, python-format
+msgid "Debit and credit of all lines are null."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__move_line_type
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__move_line_type
+msgid "Direction"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__display_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__display_name
 msgid "Display Name"
 msgstr "顯示名稱"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_id
+#: code:addons/account_move_template/wizard/account_move_template_run.py:102
+#, python-format
+msgid "Entry from template %s"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+msgid "Generate Journal Entry"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__id
 msgid "ID"
 msgstr "編號"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_search
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_tree
+#: code:addons/account_move_template/models/account_move_template.py:44
+#, 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 ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:50
+#, python-format
+msgid ""
+"Impossible to compute the formula of line with sequence %s (formula: %s): "
+"the syntax of the formula is wrong."
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__journal_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__journal_id
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
+msgid "Journal"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_search
 msgid "Journal Entry Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_tree
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid "Journal Entry Template Line"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_journal_id
-msgid "Journal id"
+#: model:ir.actions.act_window,name:account_move_template.account_move_template_action
+#: model:ir.ui.menu,name:account_move_template.account_move_template_menu
+msgid "Journal Entry Templates"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template___last_update
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line___last_update
+#: model:ir.model,name:account_move_template.model_account_move_template_line
+msgid "Journal Item Template"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 * 0.2"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L1 + L2 + L3"
+msgstr ""
+
+#. module: account_move_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
+msgid "L2 - L1"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__name
+msgid "Label"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run____last_update
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run____last_update
 msgid "Last Modified on"
 msgstr "最後修改:"
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_uid
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_uid
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_uid
 msgid "Last Updated by"
 msgstr "最後更新："
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_write_date
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__write_date
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__write_date
 msgid "Last Updated on"
 msgstr "最後更新於"
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:47
-#, python-format
-msgid "Line %s can't refer to itself"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__line_ids
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__line_ids
+msgid "Lines"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_ids
-msgid "Line ids"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Load"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
-msgid "Modify the lines before create them or edit them after creation."
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__template_id
 msgid "Move Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template_line_tree
-msgid "Move Template Line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_move_template_form
-#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form
-msgid "Move Templates"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_move_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_move_line_type
-msgid "Move line type"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_name
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_name
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__name
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__name
 msgid "Name"
 msgstr "名稱"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.wizard_select_template
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_run_form
 msgid "Next"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__note
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__note
+msgid "Note"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__tax_line_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__tax_line_id
+msgid "Originator Tax"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__partner_id
+#, fuzzy
+msgid "Override Partner"
+msgstr "夥伴"
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__partner_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__partner_id
 msgid "Partner"
 msgstr "夥伴"
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__payment_term_id
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__payment_term_id
+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
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_python_code
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_python_code
-msgid "Python code"
+#: code:addons/account_move_template/models/account_move_template.py:134
+#, python-format
+msgid "Python Code must be set for computed line with sequence %d."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template
-msgid "Select Move Template"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template__ref
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__ref
+msgid "Reference"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_sequence
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_sequence
+#: selection:account.move.template.run,state:0
+msgid "Select Template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__sequence
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_state
+#: selection:account.move.template.run,state:0
+msgid "Set Lines"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__state
 msgid "State"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line
-msgid "Template Lines"
+#: 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 ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_line_template_id
-#: model:ir.model.fields,field_description:account_move_template.field_wizard_select_move_template_template_id
-msgid "Template id"
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_run__template_id
+msgid "Template"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_template_line_ids
-msgid "Template line ids"
-msgstr ""
-
-#. module: account_move_template
-#: selection:wizard.select.move.template,state:0
-msgid "Template selected"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_form
-msgid "Test template"
+#: code:addons/account_move_template/wizard/account_move_template_run.py:54
+#, python-format
+msgid ""
+"The selected template (%s) is not in the same company (%s) as the current "
+"user (%s)."
 msgstr ""
 
 #. module: account_move_template
 #: sql_constraint:account.move.template.line:0
-msgid "The sequence of the line must be unique per template !"
+msgid "The sequence of the line must be unique per template!"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model.fields,field_description:account_move_template.field_account_document_template_line_type
-#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_type
+#: sql_constraint:account.move.template:0
+msgid "This name is already used by another template!"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line__type
 msgid "Type"
 msgstr "類型"
 
 #. module: account_move_template
-#: selection:account.document.template.line,type:0
+#: 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 ""
+
+#. module: account_move_template
 #: selection:account.move.template.line,type:0
 msgid "User input"
 msgstr ""
 
 #. module: account_move_template
-#: code:addons/account_move_template/models/account_document_template.py:64
+#: model:ir.model.fields,field_description:account_move_template.field_account_move_template_line_run__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_line_run
+msgid "Wizard Lines to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: model:ir.model,name:account_move_template.model_account_move_template_run
+msgid "Wizard to generate move from template"
+msgstr ""
+
+#. module: account_move_template
+#: code:addons/account_move_template/models/account_move_template.py:66
 #, python-format
 msgid ""
-"You can not add a different number of lines in this wizard you should try to"
-" create the move normally and then edit the created move. Inconsistent "
-"between input lines and  filled lines for template %s"
+"You added a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.ui.view,arch_db:account_move_template.view_move_template_line_form
+#: model_terms:ir.ui.view,arch_db:account_move_template.account_move_template_line_form
 msgid ""
-"You can refer to other lines using their\n"
-"                        sequence number (e.g. 'L(1)' for first line).\n"
-"                        Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1)\n"
-"                            + L(2) + L(3)'; '1250'"
+"You can refer to other lines using their sequence number e.g. <i>L1</i> for "
+"line with sequence = 1. Examples:"
 msgstr ""
 
 #. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template
-msgid "account.document.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_document_template_line
-msgid "account.document.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template
-msgid "account.move.template"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_account_move_template_line
-msgid "account.move.template.line"
-msgstr ""
-
-#. module: account_move_template
-#: model:ir.model,name:account_move_template.model_wizard_select_move_template
-msgid "wizard.select.move.template"
+#: code:addons/account_move_template/models/account_move_template.py:60
+#, python-format
+msgid ""
+"You deleted a line in the wizard. This is not allowed: you should either "
+"update the template or modify the journal entry that will be generated by "
+"this wizard."
 msgstr ""