diff --git a/account_payment_order/i18n/am.po b/account_payment_order/i18n/am.po
index 80681ba22..1682c2d49 100644
--- a/account_payment_order/i18n/am.po
+++ b/account_payment_order/i18n/am.po
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -63,12 +63,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -103,12 +103,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -118,14 +118,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -154,8 +154,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -180,8 +180,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -225,13 +225,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -243,7 +243,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -293,7 +293,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -373,14 +373,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -411,7 +410,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -421,31 +420,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -468,14 +463,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -495,7 +490,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -515,12 +510,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -565,23 +560,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -608,13 +595,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -624,11 +611,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -739,31 +721,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -778,7 +760,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -789,13 +771,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -803,13 +779,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -833,7 +809,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -857,13 +833,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -871,21 +847,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -893,12 +869,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -918,7 +894,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -971,7 +947,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1024,7 +1000,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1038,7 +1014,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1051,7 +1026,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1062,8 +1037,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1079,24 +1053,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1111,7 +1095,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1141,7 +1125,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1149,11 +1132,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1169,7 +1153,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1185,13 +1169,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1200,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1208,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1269,8 +1253,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1321,7 +1305,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/ar.po b/account_payment_order/i18n/ar.po
index bb201fe06..59f94f89d 100644
--- a/account_payment_order/i18n/ar.po
+++ b/account_payment_order/i18n/ar.po
@@ -20,13 +20,13 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/ca.po b/account_payment_order/i18n/ca.po
index 83081d0b6..1b335c9b8 100644
--- a/account_payment_order/i18n/ca.po
+++ b/account_payment_order/i18n/ca.po
@@ -20,7 +20,7 @@ msgstr ""
 "X-Generator: Weblate 3.8\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
@@ -28,7 +28,7 @@ msgstr ""
 "existent %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -68,14 +68,14 @@ msgid "<strong>Used Account:</strong>"
 msgstr "<strong>Compte usat:</strong>"
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 "Ja existeix una línia de pagament amb aquesta referència a la mateixa "
 "companyia!"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -114,12 +114,12 @@ msgid "Add All Move Lines"
 msgstr "Afegeix tots els apunts comptables"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr "Afegiu a ordre de cobrament"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr "Afegiu a ordre de pagament"
 
@@ -129,14 +129,14 @@ msgid "Add to Payment/Debit Order"
 msgstr "Afegiu a ordre de pagament/cobrament"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr "Tots els assentaments"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr "Tots els assentaments assentats"
 
@@ -165,8 +165,8 @@ msgid "Amount in Company Currency"
 msgstr "Import moneda companyia"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr "Qualsevol"
 
@@ -191,8 +191,8 @@ msgid "Bank"
 msgstr "Banc"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr "Compte bancari"
@@ -236,7 +236,7 @@ msgid "Bank account on which we should pay the supplier"
 msgstr "Compte bancari amb el qual es pagarà al proveïdor"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
@@ -244,7 +244,7 @@ msgstr ""
 "l'empresa '%s'."
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -256,7 +256,7 @@ msgid "Cancel Payments"
 msgstr "Cancel·la pagaments"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -312,7 +312,7 @@ msgid "Confirm Payments"
 msgstr "Confirma pagaments"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr "Confirmat"
@@ -392,14 +392,13 @@ msgid "Debit Orders"
 msgstr "Ordres cobrament"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr "Línia %s de banc de cobrament"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr "Ordres de cobrament %s"
@@ -430,7 +429,7 @@ msgid "Display Name"
 msgstr "Nom de visualització"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr "Realitzat"
 
@@ -440,31 +439,27 @@ msgid "Done Date"
 msgstr "Data de realització"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr "Esborrany"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr "Venciment"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr "Data venciment"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr "Data de venciment"
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr "Fitxer generat"
@@ -487,14 +482,14 @@ msgid "File Upload Date"
 msgstr "Data de pujada del fitxer"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr "Fitxer pujat"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr "Data fixa"
 
@@ -514,7 +509,7 @@ msgid "Followers (Partners)"
 msgstr "Seguidors (empreses)"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -543,12 +538,12 @@ msgstr ""
 "té un compte bancari, heu de seleccionar sempre 'Fix'."
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr "Lliure"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr "Referència lliure"
 
@@ -593,23 +588,15 @@ msgstr "Agrupa les transaccions de les ordres de pagament"
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr "ISO"
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr "Si està marcat, el nous missatges requeriran la vostre atenció."
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr "Si està marca, els missatges nous requereixen la vostra atenció."
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr "Si està marcat, alguns missatges tenen un error de lliurament."
 
@@ -648,13 +635,13 @@ msgstr ""
 "pagament amb una data de pagament anterior a la data de venciment."
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr "Immediatament"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr "Entrant"
@@ -664,11 +651,6 @@ msgstr "Entrant"
 msgid "Inbound Payment Order Only"
 msgstr "Només ordre de pagament entrant"
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -781,31 +763,31 @@ msgid "Messages"
 msgstr "Missatges"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr "Falta el diari del banc a l'ordre de pagament %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr "Falta el compte bancari de l'empresa a la línia de pagament %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr "Falta el compte bancari al diari de banc '%s'."
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr "Apunt"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr "Data de l'apunt"
 
@@ -820,7 +802,7 @@ msgid "Move Option"
 msgstr "Opció d'apunt"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr "L'apunt '%s' de l'empresa '%s' ja s'ha reconciliat"
@@ -831,13 +813,7 @@ msgid "Name or Description"
 msgstr "Nom o Descripció"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr "No hi han assentaments a la factura %s"
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -847,13 +823,13 @@ msgstr ""
 "perquè aquesta factura ja està pagada."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr "No hi ha cap mode de pagament a la factura %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -879,7 +855,9 @@ msgstr "Nombre de línies de banc"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+#, fuzzy
+#| msgid "Number of error"
+msgid "Number of errors"
 msgstr "Número d'error"
 
 #. module: account_payment_order
@@ -903,7 +881,7 @@ msgid "Offsetting Account"
 msgstr "Import de compensació"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
@@ -911,7 +889,7 @@ msgstr ""
 "(%s)."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -921,7 +899,7 @@ msgstr ""
 "d'apunt'."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
@@ -930,7 +908,7 @@ msgstr ""
 "transferència'."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
@@ -939,7 +917,7 @@ msgstr ""
 "transferència'."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -949,12 +927,12 @@ msgstr ""
 "'Compte de compensació'"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr "Un assentament per data de pagament"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr "Un assentament per línia de pagament"
 
@@ -974,7 +952,7 @@ msgid "Order"
 msgstr "Ordre"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr "Sortint"
@@ -1030,7 +1008,7 @@ msgid "Payment Execution Date Type"
 msgstr "Tipus de data d'execució del pagament"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr "Fitxer de pagament"
@@ -1083,7 +1061,7 @@ msgid "Payment Order"
 msgstr "Ordre de pagament"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr "Ordre de pagament correcte"
 
@@ -1097,7 +1075,6 @@ msgid "Payment Orders"
 msgstr "Ordres de pagament"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr "Referència de pagament"
@@ -1110,7 +1087,7 @@ msgid "Payment Type"
 msgstr "Tipus de pagament"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr "Línia de banc de pagament %s"
@@ -1121,8 +1098,7 @@ msgid "Payment lines"
 msgstr "Línies de pagament"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr "Ordre de pagament %s"
@@ -1138,24 +1114,38 @@ msgstr "Pagaments"
 msgid "Post Move"
 msgstr "Publica assentament"
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+#, fuzzy
+#| msgid "Free Reference"
+msgid "Reference Type"
+msgstr "Referència lliure"
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr "Línies de pagament relacionades"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+#, fuzzy
+#| msgid "Message Delivery error"
+msgid "SMS Delivery error"
+msgstr "Error de lliurament de missatge"
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr "Igual"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr "Igual o buit"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr "Igual o buit"
 
@@ -1170,7 +1160,7 @@ msgid "Search Payment Orders"
 msgstr "Cerca ordres de pagament"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr "Seleccioneu apunts per crear transaccions"
@@ -1202,7 +1192,6 @@ msgstr "Apunts seleccionats per crear transaccions"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1210,11 +1199,12 @@ msgstr "Estat"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr "Estat"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr "Referència estructurada"
 
@@ -1230,7 +1220,7 @@ msgid "Technical model for printing payment order"
 msgstr "Model tècnic per a imprimir ordre de pagament"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr "L'import per a l'Empresa '%s' és negatiu o nul (%.2f) !"
@@ -1251,13 +1241,14 @@ msgstr ""
 "ordres de pagament' en el mode de pagament."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
-#, python-format
-msgid "The invoice %s is not in Open state"
+#: code:addons/account_payment_order/models/account_move.py:0
+#, fuzzy, python-format
+#| msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr "La factura %s no està en estat Obert"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1269,7 +1260,7 @@ msgstr ""
 "és posterior a la data de pagament calculada %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1279,7 +1270,7 @@ msgstr ""
 "de pagament (%s)"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr "No hi han transaccions a l'ordre de pagament %s."
@@ -1345,8 +1336,8 @@ msgid "Transactions"
 msgstr "Transaccions"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr "Compte de transferència"
 
@@ -1397,7 +1388,7 @@ msgid "Wizard to create payment lines"
 msgstr "Assistent per crear línies de pagament"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
@@ -1427,3 +1418,18 @@ msgid "otherwise, new payment orders will be created (one per payment mode)."
 msgstr ""
 "altrament, es crearan ordres de pagament noves (una per cada mode de "
 "pagament)."
+
+#~ msgid "Due date"
+#~ msgstr "Data de venciment"
+
+#~ msgid "ISO"
+#~ msgstr "ISO"
+
+#~ msgid "If checked new messages require your attention."
+#~ msgstr "Si està marcat, el nous missatges requeriran la vostre atenció."
+
+#~ msgid "Invoice"
+#~ msgstr "Factura"
+
+#~ msgid "No Journal Entry on invoice %s"
+#~ msgstr "No hi han assentaments a la factura %s"
diff --git a/account_payment_order/i18n/ca_ES.po b/account_payment_order/i18n/ca_ES.po
index 2048cb5c1..7e77b55ba 100644
--- a/account_payment_order/i18n/ca_ES.po
+++ b/account_payment_order/i18n/ca_ES.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* account_payment_order
+# 	* account_payment_order
 #
 msgid ""
 msgstr ""
@@ -15,15 +15,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "%d payment lines added to the new draft payment order %s which has been automatically created."
+msgid ""
+"%d payment lines added to the new draft payment order %s which has been "
+"automatically created."
 msgstr ""
 
 #. module: account_payment_order
@@ -57,14 +59,16 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
-msgid "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d characters, so it is not valid."
+msgid ""
+"A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
+"characters, so it is not valid."
 msgstr ""
 
 #. module: account_payment_order
@@ -84,7 +88,9 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_line__bank_account_required
-msgid "Activate this option if this payment method requires you to know the bank account number of your customer or supplier."
+msgid ""
+"Activate this option if this payment method requires you to know the bank "
+"account number of your customer or supplier."
 msgstr ""
 
 #. module: account_payment_order
@@ -93,12 +99,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -108,14 +114,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -144,8 +150,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -170,8 +176,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -215,13 +221,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -233,9 +239,11 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
-msgid "Cannot delete a payment order line whose payment order is in state '%s'. You need to cancel it first."
+msgid ""
+"Cannot delete a payment order line whose payment order is in state '%s'. You "
+"need to cancel it first."
 msgstr ""
 
 #. module: account_payment_order
@@ -245,7 +253,10 @@ msgstr ""
 
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
-msgid "Click on Add All Move Lines to auto-select the move lines matching the above criteria or click on Add an item to manually select the move lines filtered by the above criteria."
+msgid ""
+"Click on Add All Move Lines to auto-select the move lines matching the above "
+"criteria or click on Add an item to manually select the move lines filtered "
+"by the above criteria."
 msgstr ""
 
 #. module: account_payment_order
@@ -278,7 +289,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -358,14 +369,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -396,7 +406,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -406,31 +416,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -453,14 +459,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -480,23 +486,32 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
-msgid "For partner '%s', the account of the account move line to pay (%s) is different from the account of of the transit move line (%s)."
+msgid ""
+"For partner '%s', the account of the account move line to pay (%s) is "
+"different from the account of of the transit move line (%s)."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__bank_account_link
-msgid "For payment modes that are always attached to the same bank account of your company (such as wire transfer from customers or SEPA direct debit from suppliers), select 'Fixed'. For payment modes that are not always attached to the same bank account (such as SEPA Direct debit for customers, wire transfer to suppliers), you should select 'Variable', which means that you will select the bank account on the payment order. If your company only has one bank account, you should always select 'Fixed'."
+msgid ""
+"For payment modes that are always attached to the same bank account of your "
+"company (such as wire transfer from customers or SEPA direct debit from "
+"suppliers), select 'Fixed'. For payment modes that are not always attached "
+"to the same bank account (such as SEPA Direct debit for customers, wire "
+"transfer to suppliers), you should select 'Variable', which means that you "
+"will select the bank account on the payment order. If your company only has "
+"one bank account, you should always select 'Fixed'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -541,29 +556,24 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_mode__group_lines
-msgid "If this mark is checked, the transaction lines of the payment order will be grouped upon confirmation of the payment order.The grouping will be done only if the following fields matches:\n"
+msgid ""
+"If this mark is checked, the transaction lines of the payment order will be "
+"grouped upon confirmation of the payment order.The grouping will be done "
+"only if the following fields matches:\n"
 "* Partner\n"
 "* Currency\n"
 "* Destination Bank Account\n"
@@ -574,17 +584,20 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_mode__no_debit_before_maturity
-msgid "If you activate this option on an Inbound payment mode, you will have an error message when you confirm a debit order that has a payment line with a payment date before the maturity date."
+msgid ""
+"If you activate this option on an Inbound payment mode, you will have an "
+"error message when you confirm a debit order that has a payment line with a "
+"payment date before the maturity date."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -594,11 +607,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -628,7 +636,9 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_mode__transfer_journal_id
-msgid "Journal to write payment entries when confirming payment/debit orders of this mode"
+msgid ""
+"Journal to write payment entries when confirming payment/debit orders of "
+"this mode"
 msgstr ""
 
 #. module: account_payment_order
@@ -707,31 +717,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -746,7 +756,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -757,27 +767,25 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "No Journal Entry on invoice %s"
+msgid ""
+"No Payment Line created for invoice %s because it already exists or because "
+"this invoice is already paid."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
-#, python-format
-msgid "No Payment Line created for invoice %s because it already exists or because this invoice is already paid."
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
-msgid "No handler for this payment method. Maybe you haven't installed the related Odoo module."
+msgid ""
+"No handler for this payment method. Maybe you haven't installed the related "
+"Odoo module."
 msgstr ""
 
 #. module: account_payment_order
@@ -797,7 +805,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -821,42 +829,48 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
-msgid "On the payment mode '%s', you must choose an option for the 'Move Option' parameter."
+msgid ""
+"On the payment mode '%s', you must choose an option for the 'Move Option' "
+"parameter."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
-msgid "On the payment mode '%s', you must select a value for the 'Transfer Account'."
+msgid ""
+"On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
-msgid "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
+msgid ""
+"On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
-msgid "On the payment mode '%s', you must select an option for the 'Offsetting Account' parameter"
+msgid ""
+"On the payment mode '%s', you must select an option for the 'Offsetting "
+"Account' parameter"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -876,7 +890,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -907,7 +921,9 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_mode__transfer_account_id
-msgid "Pay off lines in 'file uploaded' payment orders with a move on this account. You can only select accounts that are marked for reconciliation"
+msgid ""
+"Pay off lines in 'file uploaded' payment orders with a move on this account. "
+"You can only select accounts that are marked for reconciliation"
 msgstr ""
 
 #. module: account_payment_order
@@ -927,7 +943,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -980,7 +996,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -994,7 +1010,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1007,7 +1022,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1018,8 +1033,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1035,24 +1049,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1067,7 +1091,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1079,7 +1103,9 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__date_scheduled
-msgid "Select a requested date of execution if you selected 'Due Date' as the Payment Execution Date Type."
+msgid ""
+"Select a requested date of execution if you selected 'Due Date' as the "
+"Payment Execution Date Type."
 msgstr ""
 
 #. module: account_payment_order
@@ -1095,7 +1121,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1103,11 +1128,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1123,48 +1149,62 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__bank_line_ids
-msgid "The bank payment lines are used to generate the payment file. They are automatically created from transaction lines upon confirmation of the payment order: one bank payment line can group several transaction lines if the option 'Group Transactions in Payment Orders' is active on the payment mode."
+msgid ""
+"The bank payment lines are used to generate the payment file. They are "
+"automatically created from transaction lines upon confirmation of the "
+"payment order: one bank payment line can group several transaction lines if "
+"the option 'Group Transactions in Payment Orders' is active on the payment "
+"mode."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
-msgid "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. The payment line %s has a maturity date %s which is after the computed payment date %s."
+msgid ""
+"The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
+"The payment line %s has a maturity date %s which is after the computed "
+"payment date %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
-msgid "The payment type (%s) is not the same as the payment type of the payment mode (%s)"
+msgid ""
+"The payment type (%s) is not the same as the payment type of the payment "
+"mode (%s)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."
+msgid ""
+"This field is used for payable and receivable journal entries. You can put "
+"the limit date for the payment of this line."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_method__payment_order_only
-msgid "This option helps enforcing the use of payment orders for some payment methods."
+msgid ""
+"This option helps enforcing the use of payment orders for some payment "
+"methods."
 msgstr ""
 
 #. module: account_payment_order
@@ -1209,8 +1249,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1261,14 +1301,18 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
-msgid "You cannot delete an uploaded payment order. You can cancel it in order to do so."
+msgid ""
+"You cannot delete an uploaded payment order. You can cancel it in order to "
+"do so."
 msgstr ""
 
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
-msgid "if there are existing draft payment orders for the payment modes of the invoices, the payment lines will be added to those payment orders"
+msgid ""
+"if there are existing draft payment orders for the payment modes of the "
+"invoices, the payment lines will be added to those payment orders"
 msgstr ""
 
 #. module: account_payment_order
diff --git a/account_payment_order/i18n/cs.po b/account_payment_order/i18n/cs.po
index c04672872..9f6e357d0 100644
--- a/account_payment_order/i18n/cs.po
+++ b/account_payment_order/i18n/cs.po
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -63,12 +63,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -103,12 +103,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -118,14 +118,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -154,8 +154,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -180,8 +180,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -225,13 +225,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -243,7 +243,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -293,7 +293,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -373,14 +373,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -411,7 +410,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -421,31 +420,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -468,14 +463,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -495,7 +490,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -515,12 +510,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -565,23 +560,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -608,13 +595,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -624,11 +611,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -739,31 +721,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -778,7 +760,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -789,13 +771,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -803,13 +779,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -833,7 +809,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -857,13 +833,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -871,21 +847,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -893,12 +869,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -918,7 +894,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -971,7 +947,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1024,7 +1000,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1038,7 +1014,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1051,7 +1026,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1062,8 +1037,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1079,24 +1053,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1111,7 +1095,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1141,7 +1125,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1149,11 +1132,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1169,7 +1153,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1185,13 +1169,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1200,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1208,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1269,8 +1253,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1321,7 +1305,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/da_DK.po b/account_payment_order/i18n/da_DK.po
index 29c13cfdc..b63813c05 100644
--- a/account_payment_order/i18n/da_DK.po
+++ b/account_payment_order/i18n/da_DK.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr "%d betalingslinier tilføjet eksiterende kladde betaling %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr "Tilføj alle posteringslinier"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr "Tilføj til betalingsopkrævning"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr "Tilføj til betalingsorder"
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -376,14 +376,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -414,7 +413,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -424,31 +423,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -471,14 +466,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -498,7 +493,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -518,12 +513,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -568,23 +563,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -611,13 +598,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -629,11 +616,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr "Tilføj til betalingsorder"
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -744,31 +726,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -783,7 +765,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -794,13 +776,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -808,13 +784,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -838,7 +814,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -862,13 +838,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -876,21 +852,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -898,12 +874,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -925,7 +901,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -980,7 +956,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1035,7 +1011,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1049,7 +1025,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1062,7 +1037,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1073,8 +1048,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1090,24 +1064,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1122,7 +1106,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1152,7 +1136,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1160,11 +1143,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1180,7 +1164,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1196,13 +1180,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1211,7 +1195,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1219,7 +1203,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1280,8 +1264,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1332,7 +1316,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/de.po b/account_payment_order/i18n/de.po
index 66d4a20b8..59e9c1b88 100644
--- a/account_payment_order/i18n/de.po
+++ b/account_payment_order/i18n/de.po
@@ -20,7 +20,7 @@ msgstr ""
 "X-Generator: Weblate 3.3\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
@@ -28,7 +28,7 @@ msgstr ""
 "hinzugefügt wurden."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -67,14 +67,14 @@ msgid "<strong>Used Account:</strong>"
 msgstr "<strong>Verwendetes Konto:</strong>"
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 "Eine Zahlungszeile mit dieser Referenz existiert bereits im gleichen "
 "Unternehmen!"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -113,12 +113,12 @@ msgid "Add All Move Lines"
 msgstr "Alle Buchungszeilen hinzufügen"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr "Zum Lastschriftauftrag hinzufügen"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr "Zum Zahlungsauftrag hinzufügen"
 
@@ -128,14 +128,14 @@ msgid "Add to Payment/Debit Order"
 msgstr "Zum Zahlungs-/Lastschriftauftrag hinzufügen"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr "Alle Einträge"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr "Alle gebuchten Einträge"
 
@@ -164,8 +164,8 @@ msgid "Amount in Company Currency"
 msgstr "Betrag in Unternehmenswährung"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr "Beliebige"
 
@@ -191,8 +191,8 @@ msgid "Bank"
 msgstr "Bank"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr "Bankkonto"
@@ -236,13 +236,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -254,7 +254,7 @@ msgid "Cancel Payments"
 msgstr "Zahlungen abbrechen"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -304,7 +304,7 @@ msgid "Confirm Payments"
 msgstr "Zahlungen bestätigen"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr "Bestätigt"
@@ -386,14 +386,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -424,7 +423,7 @@ msgid "Display Name"
 msgstr "Anzeigename"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -434,31 +433,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr "Entwurf"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr "Fällig"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr "Fälligkeitsdatum"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr "Fälligkeitsdatum"
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr "Datei erstellt"
@@ -481,14 +476,14 @@ msgid "File Upload Date"
 msgstr "Hochladungsdatum der Datei"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr "Datei hochgeladen"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -508,7 +503,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -528,12 +523,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 #, fuzzy
 msgid "Free Reference"
 msgstr "Zahlungsreferenz"
@@ -579,23 +574,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr "ISO"
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -622,13 +609,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr "Sofort"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr "Eingehend"
@@ -640,11 +627,6 @@ msgstr "Eingehend"
 msgid "Inbound Payment Order Only"
 msgstr "Zahlungsauftrag"
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr "Rechnung"
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -758,31 +740,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -797,7 +779,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -809,13 +791,7 @@ msgid "Name or Description"
 msgstr "Gleich oder leer"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -823,13 +799,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -855,7 +831,7 @@ msgstr "Anzahl der Bankzeilen"
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
 #, fuzzy
-msgid "Number of error"
+msgid "Number of errors"
 msgstr "Anzahl der Bankzeilen"
 
 #. module: account_payment_order
@@ -880,13 +856,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -894,21 +870,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -916,12 +892,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -943,7 +919,7 @@ msgid "Order"
 msgstr "Auftrag"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr "Ausgehend"
@@ -999,7 +975,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr "Zahlungsdatei"
@@ -1054,7 +1030,7 @@ msgid "Payment Order"
 msgstr "Zahlungsauftrag"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1068,7 +1044,6 @@ msgid "Payment Orders"
 msgstr "Zahlungsaufträge"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr "Zahlungsreferenz"
@@ -1081,7 +1056,7 @@ msgid "Payment Type"
 msgstr "Zahlungsart"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1092,8 +1067,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1109,24 +1083,35 @@ msgstr "Zahlungen"
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+#, fuzzy
+msgid "Reference Type"
+msgstr "Zahlungsreferenz"
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr "Zugehörige Zahlungszeilen"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr "Gleich"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr "Gleich oder Leer"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr "Gleich oder leer"
 
@@ -1141,7 +1126,7 @@ msgid "Search Payment Orders"
 msgstr "Durchsuche Zahlungsaufträge"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1171,7 +1156,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1179,11 +1163,12 @@ msgstr "Bundesland"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr "Status"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1199,7 +1184,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1215,13 +1200,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1230,7 +1215,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1238,7 +1223,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1299,8 +1284,8 @@ msgid "Transactions"
 msgstr "Transaktionen"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1351,7 +1336,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
@@ -1375,5 +1360,14 @@ msgstr "ein"
 msgid "otherwise, new payment orders will be created (one per payment mode)."
 msgstr ""
 
+#~ msgid "Due date"
+#~ msgstr "Fälligkeitsdatum"
+
+#~ msgid "ISO"
+#~ msgstr "ISO"
+
+#~ msgid "Invoice"
+#~ msgstr "Rechnung"
+
 #~ msgid "Account Entry"
 #~ msgstr "Kontoeintrag"
diff --git a/account_payment_order/i18n/el_GR.po b/account_payment_order/i18n/el_GR.po
index 764f19247..5eec177bc 100644
--- a/account_payment_order/i18n/el_GR.po
+++ b/account_payment_order/i18n/el_GR.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -376,14 +376,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -414,7 +413,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -424,31 +423,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -471,14 +466,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -498,7 +493,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -518,12 +513,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -568,23 +563,15 @@ msgstr ""
 msgid "ID"
 msgstr "Κωδικός"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -611,13 +598,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -627,11 +614,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -742,31 +724,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -781,7 +763,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -792,13 +774,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -806,13 +782,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -836,7 +812,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -860,13 +836,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -874,21 +850,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -896,12 +872,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -921,7 +897,7 @@ msgid "Order"
 msgstr "Παραγγελία"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -974,7 +950,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1027,7 +1003,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1041,7 +1017,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1054,7 +1029,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1065,8 +1040,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1082,24 +1056,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1114,7 +1098,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1144,7 +1128,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1152,11 +1135,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1172,7 +1156,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1188,13 +1172,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1203,7 +1187,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1211,7 +1195,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1272,8 +1256,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1324,7 +1308,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/es.po b/account_payment_order/i18n/es.po
index a815836d5..107a5ff79 100644
--- a/account_payment_order/i18n/es.po
+++ b/account_payment_order/i18n/es.po
@@ -20,13 +20,13 @@ msgstr ""
 "X-Generator: Weblate 3.0.1\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr "%d líneas de pago añadidas a la orden de pago en borrador %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -66,12 +66,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr "<strong>Cuenta usada:</strong>"
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr "Una línea de pago ya existe con esta referencia en la misma compañía!"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -110,12 +110,12 @@ msgid "Add All Move Lines"
 msgstr "Añadir todos los apuntes contables"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr "Añadir a orden de cobro"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr "Añadir a orden de pago"
 
@@ -125,14 +125,14 @@ msgid "Add to Payment/Debit Order"
 msgstr "Añadir a orden de pago/cobro"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr "Todos los asientos"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr "Todos los asientos asentados"
 
@@ -161,8 +161,8 @@ msgid "Amount in Company Currency"
 msgstr "Importes moneda compañía"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr "Cualquiera"
 
@@ -188,8 +188,8 @@ msgid "Bank"
 msgstr "Banco"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr "Cuenta bancaria"
@@ -233,7 +233,7 @@ msgid "Bank account on which we should pay the supplier"
 msgstr "Cuenta bancaria en la que debemos pagar al proveedor"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
@@ -241,7 +241,7 @@ msgstr ""
 "'%s'."
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -253,7 +253,7 @@ msgid "Cancel Payments"
 msgstr "Cancelar pagos"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -308,7 +308,7 @@ msgid "Confirm Payments"
 msgstr "Confirmar pagos"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr "Confirmado"
@@ -390,14 +390,13 @@ msgid "Debit Orders"
 msgstr "Órdenes de cobro"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr "Línea de adeudo de banco %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr "Orden de cobro %s"
@@ -428,7 +427,7 @@ msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr "Realizado"
 
@@ -438,31 +437,27 @@ msgid "Done Date"
 msgstr "Fecha de realización"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr "Vencimiento"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr "Fecha de vencimiento"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr "Fecha de vencimiento"
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr "Fichero generado"
@@ -485,14 +480,14 @@ msgid "File Upload Date"
 msgstr "Fecha de subida del fichero"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr "Fichero subido"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr "Fecha fija"
 
@@ -512,7 +507,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -542,12 +537,12 @@ msgstr ""
 "'Fijo'."
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr "Libre"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 #, fuzzy
 msgid "Free Reference"
 msgstr "Referencia de pago"
@@ -593,23 +588,15 @@ msgstr "Agrupar transacciones en las órdenes de pago"
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr "ISO"
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -649,13 +636,13 @@ msgstr ""
 "una fecha de pago anterior a la fecha de vencimiento."
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr "Inmediatamente"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr "Entrante"
@@ -667,11 +654,6 @@ msgstr "Entrante"
 msgid "Inbound Payment Order Only"
 msgstr "Orden de Pago correcta"
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -788,31 +770,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr "No se ha establecido el diario de banco en la orden %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr "No se ha establecido la cuenta bancaria en la línea de pago %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr "Falta la cuenta bancaria para el diario de banco '%s'."
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr "Asiento"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr "Fecha del asiento"
 
@@ -827,7 +809,7 @@ msgid "Move Option"
 msgstr "Opciones de asiento"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr "El apunte '%s' de la empresa '%s' ya ha sido conciliado"
@@ -838,13 +820,7 @@ msgid "Name or Description"
 msgstr "Nombre o descripción"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr "No se ha encontrado asiento en la factura %s"
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -854,13 +830,13 @@ msgstr ""
 "la factura ya está pagada."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr "No hay modo de pago en la factura %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -888,7 +864,7 @@ msgstr "Número de líneas bancarias"
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
 #, fuzzy
-msgid "Number of error"
+msgid "Number of errors"
 msgstr "Número de líneas bancarias"
 
 #. module: account_payment_order
@@ -913,13 +889,13 @@ msgid "Offsetting Account"
 msgstr "Cuenta de compensación"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr "En la orden %s, la fecha de ejecución es anterior a la actual (%s)."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -929,7 +905,7 @@ msgstr ""
 "asiento'."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
@@ -938,7 +914,7 @@ msgstr ""
 "transferencia'."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
@@ -947,7 +923,7 @@ msgstr ""
 "transferencia'."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -957,12 +933,12 @@ msgstr ""
 "'Cuenta de compensación'"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr "Un asiento por fecha de pago"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr "Un asiento por línea de pago"
 
@@ -984,7 +960,7 @@ msgid "Order"
 msgstr "Orden"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr "Saliente"
@@ -1043,7 +1019,7 @@ msgid "Payment Execution Date Type"
 msgstr "Tipo de fecha de ejecución del pago"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr "Archivo de remesa"
@@ -1098,7 +1074,7 @@ msgid "Payment Order"
 msgstr "Orden de pago"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr "Orden de Pago correcta"
 
@@ -1112,7 +1088,6 @@ msgid "Payment Orders"
 msgstr "Órdenes de pago"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr "Referencia de pago"
@@ -1125,7 +1100,7 @@ msgid "Payment Type"
 msgstr "Tipo de pago"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr "Línea de pago bancario %s"
@@ -1136,8 +1111,7 @@ msgid "Payment lines"
 msgstr "Líneas de pago"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr "Orden %s"
@@ -1153,24 +1127,35 @@ msgstr "Pagos"
 msgid "Post Move"
 msgstr "Publicar movimiento"
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+#, fuzzy
+msgid "Reference Type"
+msgstr "Referencia de pago"
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr "Líneas de pago relacionadas"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr "Igual"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr "Igual o vacío"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr "Igual o vacío"
 
@@ -1185,7 +1170,7 @@ msgid "Search Payment Orders"
 msgstr "Buscar órdees"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr "Seleccione apuntes para crear transacciones"
@@ -1217,7 +1202,6 @@ msgstr "Apuntes seleccionados para crear transacciones"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1225,11 +1209,12 @@ msgstr "Estado"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr "Estado"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr "Referencia esctructurada"
 
@@ -1245,7 +1230,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr "El importe para el empresa '%s' es negativo o nulo (%.2f) !"
@@ -1266,13 +1251,14 @@ msgstr ""
 "activada en el modo de pago."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
-#, python-format
-msgid "The invoice %s is not in Open state"
+#: code:addons/account_payment_order/models/account_move.py:0
+#, fuzzy, python-format
+#| msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr "La factura %s no está en estado abierta"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1284,7 +1270,7 @@ msgstr ""
 "es después de la fecha de pago calculada %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1293,7 +1279,7 @@ msgstr ""
 "El tipo de pago (%s) no es el mismo que el tipo de pago del modo de pago (%s)"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr "No hay transacciones en la orden %s."
@@ -1357,8 +1343,8 @@ msgid "Transactions"
 msgstr "Transacciones"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr "Cuenta de transferencia"
 
@@ -1409,7 +1395,7 @@ msgid "Wizard to create payment lines"
 msgstr "Asistente para crear líneas de pago"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
@@ -1438,6 +1424,18 @@ msgid "otherwise, new payment orders will be created (one per payment mode)."
 msgstr ""
 "En caso contrario, se crearán nuevas órdenes (una por cada modo de pago)."
 
+#~ msgid "Due date"
+#~ msgstr "Fecha de vencimiento"
+
+#~ msgid "ISO"
+#~ msgstr "ISO"
+
+#~ msgid "Invoice"
+#~ msgstr "Factura"
+
+#~ msgid "No Journal Entry on invoice %s"
+#~ msgstr "No se ha encontrado asiento en la factura %s"
+
 #~ msgid "Payment Order / Payment"
 #~ msgstr "Orden de Pago / Pago"
 
diff --git a/account_payment_order/i18n/es_CR.po b/account_payment_order/i18n/es_CR.po
index 650e5d84e..da2a1ac14 100644
--- a/account_payment_order/i18n/es_CR.po
+++ b/account_payment_order/i18n/es_CR.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/es_EC.po b/account_payment_order/i18n/es_EC.po
index 399998b5f..a1dba7703 100644
--- a/account_payment_order/i18n/es_EC.po
+++ b/account_payment_order/i18n/es_EC.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/es_ES.po b/account_payment_order/i18n/es_ES.po
index 1e52cb9c5..ad201b70d 100644
--- a/account_payment_order/i18n/es_ES.po
+++ b/account_payment_order/i18n/es_ES.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/es_MX.po b/account_payment_order/i18n/es_MX.po
index 5ee860145..bbe8610a9 100644
--- a/account_payment_order/i18n/es_MX.po
+++ b/account_payment_order/i18n/es_MX.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/es_VE.po b/account_payment_order/i18n/es_VE.po
index 43cb878f3..aaa40cc6d 100644
--- a/account_payment_order/i18n/es_VE.po
+++ b/account_payment_order/i18n/es_VE.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/et.po b/account_payment_order/i18n/et.po
index dfdf7202b..f487b92b8 100644
--- a/account_payment_order/i18n/et.po
+++ b/account_payment_order/i18n/et.po
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -63,12 +63,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -103,12 +103,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -118,14 +118,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -154,8 +154,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -180,8 +180,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -225,13 +225,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -243,7 +243,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -293,7 +293,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -373,14 +373,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -411,7 +410,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -421,31 +420,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -468,14 +463,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -495,7 +490,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -515,12 +510,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -565,23 +560,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -608,13 +595,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -624,11 +611,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -739,31 +721,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -778,7 +760,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -789,13 +771,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -803,13 +779,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -833,7 +809,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -857,13 +833,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -871,21 +847,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -893,12 +869,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -918,7 +894,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -971,7 +947,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1024,7 +1000,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1038,7 +1014,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1051,7 +1026,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1062,8 +1037,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1079,24 +1053,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1111,7 +1095,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1141,7 +1125,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1149,11 +1132,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1169,7 +1153,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1185,13 +1169,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1200,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1208,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1269,8 +1253,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1321,7 +1305,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/fi.po b/account_payment_order/i18n/fi.po
index bcc487414..12d768347 100644
--- a/account_payment_order/i18n/fi.po
+++ b/account_payment_order/i18n/fi.po
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -63,12 +63,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -103,12 +103,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -118,14 +118,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -154,8 +154,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -180,8 +180,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -225,13 +225,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -243,7 +243,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -293,7 +293,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr "Hyväksytty"
@@ -373,14 +373,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -411,7 +410,7 @@ msgid "Display Name"
 msgstr "Nimi"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -421,31 +420,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -468,14 +463,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -495,7 +490,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -515,12 +510,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -565,23 +560,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -608,13 +595,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -624,11 +611,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -739,31 +721,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -778,7 +760,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -789,13 +771,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -803,13 +779,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -833,7 +809,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -857,13 +833,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -871,21 +847,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -893,12 +869,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -918,7 +894,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -971,7 +947,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1024,7 +1000,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1038,7 +1014,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1051,7 +1026,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1062,8 +1037,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1079,24 +1053,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1111,7 +1095,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1141,7 +1125,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1149,11 +1132,12 @@ msgstr "Tila"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1169,7 +1153,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1185,13 +1169,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1200,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1208,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1269,8 +1253,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1321,7 +1305,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/fr.po b/account_payment_order/i18n/fr.po
index 865486728..2293eae94 100644
--- a/account_payment_order/i18n/fr.po
+++ b/account_payment_order/i18n/fr.po
@@ -19,14 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 "Lignes de paiement %d ont été ajouté à l'ordre de paiement %s en brouillon"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -67,13 +67,13 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 "Une ligne de paiement existe déjà avec cette référence dans la même société !"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -112,12 +112,12 @@ msgid "Add All Move Lines"
 msgstr "Ajouter des écritures comptables"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr "Ajouter à l'ordre de débit"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr "Ajouter à l'ordre de paiement"
 
@@ -127,14 +127,14 @@ msgid "Add to Payment/Debit Order"
 msgstr "Ajouter à l'ordre de paiement/débit"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr "Toutes les écritures"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr "Toutes les écritures passées"
 
@@ -163,8 +163,8 @@ msgid "Amount in Company Currency"
 msgstr "Montant dans la devise société"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr "Tout"
 
@@ -190,8 +190,8 @@ msgid "Bank"
 msgstr "Banque"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr "Compte bancaire"
@@ -235,7 +235,7 @@ msgid "Bank account on which we should pay the supplier"
 msgstr "Compte bancaire sur lequel nous devrions payer le fournisseur"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
@@ -243,7 +243,7 @@ msgstr ""
 "%s du partenaire '%s'."
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -255,7 +255,7 @@ msgid "Cancel Payments"
 msgstr "Paiements annulés"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -311,7 +311,7 @@ msgid "Confirm Payments"
 msgstr "Confirmer le paiement"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr "Confirmé"
@@ -393,14 +393,13 @@ msgid "Debit Orders"
 msgstr "Ordres de prélèvement"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr "Prélèvement ligne bancaire %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr "Ordre de prélèvement %s"
@@ -431,7 +430,7 @@ msgid "Display Name"
 msgstr "Nom à afficher"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -442,31 +441,27 @@ msgid "Done Date"
 msgstr "Date d'échéance"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr "Brouillon"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr "Échéance"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr "Date d'échéance"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr "Date d'échéance"
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr "Fichier généré"
@@ -489,14 +484,14 @@ msgid "File Upload Date"
 msgstr "Date de téléchargement du fichier"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr "Fichier téléchargé"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr "Date fixe"
 
@@ -516,7 +511,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -547,12 +542,12 @@ msgstr ""
 "ne dispose que d'un compte bancaire, vous devez toujours sélectionner 'Fixe'."
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr "Libre"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 #, fuzzy
 msgid "Free Reference"
 msgstr "Référence du paiement"
@@ -598,23 +593,15 @@ msgstr "Grouper les opérations des ordres de paiement"
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr "ISO"
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -656,13 +643,13 @@ msgstr ""
 "la date d'échéance."
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr "Immédiatement"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr "Entrant"
@@ -673,11 +660,6 @@ msgstr "Entrant"
 msgid "Inbound Payment Order Only"
 msgstr "Ordre de paiement"
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr "Facture"
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 #, fuzzy
@@ -795,31 +777,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr "Journal bancaire manquant sur l'ordre de paiement %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr "Compte bancaire du partenaire manquant sur la ligne de paiement %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr "Journal bancaire manquant sur le journal '%s'."
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr "Écriture"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr "Date du mouvement"
 
@@ -834,7 +816,7 @@ msgid "Move Option"
 msgstr "Option écriture"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr "La ligne d'écriture '%s' du partenaire '%s' a déjà été réconciliée"
@@ -846,13 +828,7 @@ msgid "Name or Description"
 msgstr "Identique ou vide"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr "Pas de pièce comptable sur la facture %s"
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -862,13 +838,13 @@ msgstr ""
 "ou parce que cette facture est déjà payée."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr "Pas de mode de paiement sur la facture %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -896,7 +872,7 @@ msgstr "Nombre de lignes bancaires"
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
 #, fuzzy
-msgid "Number of error"
+msgid "Number of errors"
 msgstr "Nombre de lignes bancaires"
 
 #. module: account_payment_order
@@ -921,14 +897,14 @@ msgid "Offsetting Account"
 msgstr "Compte de compensation"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 "Sur l'ordre de paiement %s, la date d'exécution du paiement est passée (%s)."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -938,7 +914,7 @@ msgstr ""
 "paramètre 'Option d'écriture'."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
@@ -947,7 +923,7 @@ msgstr ""
 "'Compte de transfert'."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
@@ -956,7 +932,7 @@ msgstr ""
 "'Journal de transfert'."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -966,12 +942,12 @@ msgstr ""
 "paramètre 'Compte de compensation'"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr "Un mouvement par date de paiement"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr "Un mouvement par ligne de paiement"
 
@@ -993,7 +969,7 @@ msgid "Order"
 msgstr "Ordre"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr "Sortant"
@@ -1051,7 +1027,7 @@ msgid "Payment Execution Date Type"
 msgstr "Type de la date d'exécution du paiement"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr "Fichier de paiement"
@@ -1106,7 +1082,7 @@ msgid "Payment Order"
 msgstr "Ordre de paiement"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 #, fuzzy
 msgid "Payment Order Ok"
 msgstr "Ordre de paiement"
@@ -1121,7 +1097,6 @@ msgid "Payment Orders"
 msgstr "Ordre de paiements"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr "Référence du paiement"
@@ -1134,7 +1109,7 @@ msgid "Payment Type"
 msgstr "Type de paiement"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr "Ligne bancaire du paiement %s"
@@ -1146,8 +1121,7 @@ msgid "Payment lines"
 msgstr "Lignes de paiement"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr "Ordre de paiement %s"
@@ -1163,24 +1137,35 @@ msgstr "Paiements"
 msgid "Post Move"
 msgstr "Mouvement posté"
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+#, fuzzy
+msgid "Reference Type"
+msgstr "Référence du paiement"
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr "Lignes de paiement liés"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr "Identique"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr "Identique ou vide"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr "Identique ou vide"
 
@@ -1195,7 +1180,7 @@ msgid "Search Payment Orders"
 msgstr "Ordres de paiement"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr "Sélectionner les écritures comptables pour créer les opérations"
@@ -1227,7 +1212,6 @@ msgstr "Sélectionner les écritures comptables pour créer les opérations"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1235,11 +1219,12 @@ msgstr "État"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr "Statut"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr "Référence structurée"
 
@@ -1255,7 +1240,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr "Le montant pour le partenaire '%s' est négatif ou nul (%.2f) !"
@@ -1276,13 +1261,14 @@ msgstr ""
 "dans les ordres de paiement' est active sur le mode de paiement."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
-#, python-format
-msgid "The invoice %s is not in Open state"
+#: code:addons/account_payment_order/models/account_move.py:0
+#, fuzzy, python-format
+#| msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr "La facture %s n'est pas ouverte"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1294,7 +1280,7 @@ msgstr ""
 "postérieure à la date de paiement calculée %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1304,7 +1290,7 @@ msgstr ""
 "de paiement (%s)"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr "Il n'y a aucune opération sur l'ordre de paiement %s."
@@ -1369,8 +1355,8 @@ msgid "Transactions"
 msgstr "Opérations"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr "Compte de transfert"
 
@@ -1422,7 +1408,7 @@ msgid "Wizard to create payment lines"
 msgstr "Assistant pour créer des lignes de paiement"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
@@ -1451,6 +1437,18 @@ msgid "otherwise, new payment orders will be created (one per payment mode)."
 msgstr ""
 "Sinon, de nouveaux ordres de paiement seront créés (un par mode de paiement)."
 
+#~ msgid "Due date"
+#~ msgstr "Date d'échéance"
+
+#~ msgid "ISO"
+#~ msgstr "ISO"
+
+#~ msgid "Invoice"
+#~ msgstr "Facture"
+
+#~ msgid "No Journal Entry on invoice %s"
+#~ msgstr "Pas de pièce comptable sur la facture %s"
+
 #, fuzzy
 #~ msgid "Payment Order / Payment"
 #~ msgstr "Ordre de paiement"
diff --git a/account_payment_order/i18n/gl.po b/account_payment_order/i18n/gl.po
index 1745559b4..9393ca8c2 100644
--- a/account_payment_order/i18n/gl.po
+++ b/account_payment_order/i18n/gl.po
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -63,12 +63,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -103,12 +103,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -118,14 +118,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -154,8 +154,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -180,8 +180,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -225,13 +225,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -243,7 +243,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -293,7 +293,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -373,14 +373,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -411,7 +410,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -421,31 +420,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -468,14 +463,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -495,7 +490,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -515,12 +510,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -565,23 +560,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -608,13 +595,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -624,11 +611,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -739,31 +721,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -778,7 +760,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -789,13 +771,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -803,13 +779,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -833,7 +809,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -857,13 +833,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -871,21 +847,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -893,12 +869,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -918,7 +894,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -971,7 +947,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1024,7 +1000,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1038,7 +1014,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1051,7 +1026,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1062,8 +1037,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1079,24 +1053,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1111,7 +1095,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1141,7 +1125,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1149,11 +1132,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1169,7 +1153,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1185,13 +1169,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1200,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1208,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1269,8 +1253,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1321,7 +1305,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/hr.po b/account_payment_order/i18n/hr.po
index 2bd60fdec..b75cf9829 100644
--- a/account_payment_order/i18n/hr.po
+++ b/account_payment_order/i18n/hr.po
@@ -20,13 +20,13 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr "Sve stavke"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr "Sve proknjižene stavke"
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr "Iznos u lokalnoj valuti"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr "Bilokoji"
 
@@ -182,8 +182,8 @@ msgid "Bank"
 msgstr "Banka"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr "Bankovni račun"
@@ -227,13 +227,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -245,7 +245,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -295,7 +295,7 @@ msgid "Confirm Payments"
 msgstr "Potvrdi plaćanja"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr "Potvrđeno"
@@ -377,14 +377,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -415,7 +414,7 @@ msgid "Display Name"
 msgstr "Naziv"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -425,31 +424,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -472,14 +467,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -499,7 +494,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -519,12 +514,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -569,23 +564,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -612,13 +599,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -629,11 +616,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr "Nalog za plaćanje"
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -747,31 +729,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -786,7 +768,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -797,13 +779,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -811,13 +787,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -841,7 +817,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -865,13 +841,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -879,21 +855,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -901,12 +877,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -928,7 +904,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -982,7 +958,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1037,7 +1013,7 @@ msgid "Payment Order"
 msgstr "Nalog za plaćanje"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 #, fuzzy
 msgid "Payment Order Ok"
 msgstr "Nalog za plaćanje"
@@ -1052,7 +1028,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1065,7 +1040,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1077,8 +1052,7 @@ msgid "Payment lines"
 msgstr "Stavke plaćanja"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1094,24 +1068,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1126,7 +1110,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1156,7 +1140,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1164,11 +1147,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1184,7 +1168,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1200,13 +1184,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1215,7 +1199,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1223,7 +1207,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1284,8 +1268,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1336,7 +1320,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/it.po b/account_payment_order/i18n/it.po
index 0c99d73f4..de8ff6b38 100644
--- a/account_payment_order/i18n/it.po
+++ b/account_payment_order/i18n/it.po
@@ -20,13 +20,13 @@ msgstr ""
 "X-Generator: Weblate 3.5.1\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr "Aggiungi a ordine di Addebito"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr "Aggiungi a ordine di Pagamento/Addebito"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -376,14 +376,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -414,7 +413,7 @@ msgid "Display Name"
 msgstr "Nome da visualizzare"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -424,31 +423,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -471,14 +466,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -498,7 +493,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -518,12 +513,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -568,23 +563,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -611,13 +598,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -627,11 +614,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -742,31 +724,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -781,7 +763,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -792,13 +774,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -806,13 +782,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -836,7 +812,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -860,13 +836,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -874,21 +850,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -896,12 +872,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -921,7 +897,7 @@ msgid "Order"
 msgstr "Ordine"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -976,7 +952,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1029,7 +1005,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1043,7 +1019,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1056,7 +1031,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1067,8 +1042,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1084,24 +1058,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1116,7 +1100,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1146,7 +1130,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1154,11 +1137,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1174,7 +1158,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1190,13 +1174,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1205,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1213,7 +1197,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1274,8 +1258,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1326,7 +1310,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/lt.po b/account_payment_order/i18n/lt.po
index 6fa73f290..96d808877 100644
--- a/account_payment_order/i18n/lt.po
+++ b/account_payment_order/i18n/lt.po
@@ -20,13 +20,13 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/nb_NO.po b/account_payment_order/i18n/nb_NO.po
index 7c5e5083c..9c513650a 100644
--- a/account_payment_order/i18n/nb_NO.po
+++ b/account_payment_order/i18n/nb_NO.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,14 +64,14 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 "En betalingslinje eksisterer allerede med denne referansen i det samme "
 "firmaet!"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -108,12 +108,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr "Legg til betalingsordre"
 
@@ -123,14 +123,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr "Alle oppføringer"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr "Noen"
 
@@ -186,8 +186,8 @@ msgid "Bank"
 msgstr "Bank"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr "Bankkonto"
@@ -231,13 +231,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr "Bankkonto som vi skal betale til leverandøren med"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -249,7 +249,7 @@ msgid "Cancel Payments"
 msgstr "Kanseller betalinger"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -299,7 +299,7 @@ msgid "Confirm Payments"
 msgstr "Bekreft betalinger"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr "Bekrefter"
@@ -381,14 +381,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -419,7 +418,7 @@ msgid "Display Name"
 msgstr "Vis navn"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -429,31 +428,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr "Drøfting"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr "Utløper"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr "Utløpsdato"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr "Utløpsdato"
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr "Fil generert"
@@ -476,14 +471,14 @@ msgid "File Upload Date"
 msgstr "Filopplastningsdato"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr "Fil lastet opp"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -503,7 +498,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -523,12 +518,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr "Gratis"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 #, fuzzy
 msgid "Free Reference"
 msgstr "Betalingsreferanse"
@@ -574,23 +569,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -617,13 +604,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr "Umiddelbart"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr "Innkommende"
@@ -634,11 +621,6 @@ msgstr "Innkommende"
 msgid "Inbound Payment Order Only"
 msgstr "Betalingsordre"
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -752,31 +734,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -791,7 +773,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -803,13 +785,7 @@ msgid "Name or Description"
 msgstr "Samme eller tomme"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -817,13 +793,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -848,8 +824,9 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
-msgstr ""
+#, fuzzy
+msgid "Number of errors"
+msgstr "Samme eller tomme"
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction_counter
@@ -872,13 +849,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -886,21 +863,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -908,12 +885,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -935,7 +912,7 @@ msgid "Order"
 msgstr "Ordre"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -989,7 +966,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr "Betalingsfil"
@@ -1044,7 +1021,7 @@ msgid "Payment Order"
 msgstr "Betalingsordre"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 #, fuzzy
 msgid "Payment Order Ok"
 msgstr "Betalingsordre"
@@ -1059,7 +1036,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr "Betalingsreferanse"
@@ -1072,7 +1048,7 @@ msgid "Payment Type"
 msgstr "Betalingstype"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1084,8 +1060,7 @@ msgid "Payment lines"
 msgstr "Betalingsfil"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1101,24 +1076,35 @@ msgstr "Betalinger"
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+#, fuzzy
+msgid "Reference Type"
+msgstr "Betalingsreferanse"
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr "Samme"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr "Samme eller tomme"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr "Samme eller tomme"
 
@@ -1133,7 +1119,7 @@ msgid "Search Payment Orders"
 msgstr "Søk for betalingsordre"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1163,7 +1149,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1171,11 +1156,12 @@ msgstr "Tilstand"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr "Status"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1191,7 +1177,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1207,13 +1193,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1222,7 +1208,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1230,7 +1216,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1291,8 +1277,8 @@ msgid "Transactions"
 msgstr "Transaksjoner"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr "Transaksjonskonto"
 
@@ -1343,7 +1329,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
@@ -1366,3 +1352,6 @@ msgstr "på"
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 msgid "otherwise, new payment orders will be created (one per payment mode)."
 msgstr ""
+
+#~ msgid "Due date"
+#~ msgstr "Utløpsdato"
diff --git a/account_payment_order/i18n/nl.po b/account_payment_order/i18n/nl.po
index 43cff756d..0c66046dc 100644
--- a/account_payment_order/i18n/nl.po
+++ b/account_payment_order/i18n/nl.po
@@ -20,7 +20,7 @@ msgstr ""
 "X-Generator: Weblate 3.3\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
@@ -28,7 +28,7 @@ msgstr ""
 "%s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -66,12 +66,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -110,12 +110,12 @@ msgid "Add All Move Lines"
 msgstr "Toevoegen alle mutaties"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr "Toevoegen aan betaalopdracht"
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr "Toevoegen aan betaalopdracht"
 
@@ -125,14 +125,14 @@ msgid "Add to Payment/Debit Order"
 msgstr "Toevoegen aan betaalopdracht"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr "Alle boekingen"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr "Ale definitieve boekingen"
 
@@ -161,8 +161,8 @@ msgid "Amount in Company Currency"
 msgstr "Bedrag in bedrijfsvaluta"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr "Iedere"
 
@@ -188,8 +188,8 @@ msgid "Bank"
 msgstr "Bank"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr "Bankrekeningen"
@@ -233,13 +233,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr "Bankrekening waarop de leverancier etaald dient te worden"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -251,7 +251,7 @@ msgid "Cancel Payments"
 msgstr "Annuleer betalingen"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -301,7 +301,7 @@ msgid "Confirm Payments"
 msgstr "Bevestig betalingen"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr "Bevestigd"
@@ -383,14 +383,13 @@ msgid "Debit Orders"
 msgstr "Inkomende Betaalopdrachten"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr "Debit betaalregel %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr "Betaalopdrachten %s"
@@ -421,7 +420,7 @@ msgid "Display Name"
 msgstr "Weergave naam"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -431,31 +430,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr "Concept"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr "Vervallen"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr "Vervaldatum"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr "Vervaldatum"
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr "Bestand aangemaakt"
@@ -478,14 +473,14 @@ msgid "File Upload Date"
 msgstr "Bestand upload datum"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr "Bestand geuploaded"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr "Vaste datum"
 
@@ -505,7 +500,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -525,12 +520,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr "Gratis"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 #, fuzzy
 msgid "Free Reference"
 msgstr "Betaalreferentie"
@@ -576,23 +571,15 @@ msgstr "Groepeer transacties in betaalopdracht"
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr "ISO"
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -619,13 +606,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr "Direct"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr "Inkomend"
@@ -637,11 +624,6 @@ msgstr "Inkomend"
 msgid "Inbound Payment Order Only"
 msgstr "Betalingsopdracht"
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr "Factuur"
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -756,31 +738,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr "Ontbrekend bankboek op betaalopdracht %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr "Ontbrekenende bankrekening van relatie op betaalregel %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr "Mutatie"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr "Mutatie datum"
 
@@ -795,7 +777,7 @@ msgid "Move Option"
 msgstr "Mutatie optie"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr "Muttaieregel '%s' van relatie '%s' is al afgeletterd"
@@ -807,13 +789,7 @@ msgid "Name or Description"
 msgstr "Zelfde of leeg"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr "Geen boekingen van factuur %s"
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -821,13 +797,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr "Geen betaalmode van factuur %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -853,7 +829,7 @@ msgstr "Aantal bankregels"
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
 #, fuzzy
-msgid "Number of error"
+msgid "Number of errors"
 msgstr "Aantal bankregels"
 
 #. module: account_payment_order
@@ -878,13 +854,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -892,21 +868,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -914,12 +890,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr "Één boeking per betaaldatum"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr "Één boeking per betaalregel"
 
@@ -941,7 +917,7 @@ msgid "Order"
 msgstr "Volgorde"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr "UItgaand"
@@ -997,7 +973,7 @@ msgid "Payment Execution Date Type"
 msgstr "Betaaldatum soort"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr "Betaalbestand"
@@ -1052,7 +1028,7 @@ msgid "Payment Order"
 msgstr "Betalingsopdracht"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1066,7 +1042,6 @@ msgid "Payment Orders"
 msgstr "Uitgaande Betaalopdrachten"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr "Betaalreferentie"
@@ -1079,7 +1054,7 @@ msgid "Payment Type"
 msgstr "Betaalwijze"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr "Betaalregel %s"
@@ -1090,8 +1065,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr "Betaalopdracht %s"
@@ -1107,24 +1081,35 @@ msgstr "Betalingen"
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+#, fuzzy
+msgid "Reference Type"
+msgstr "Betaalreferentie"
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr "Gekoppelde betaalregels"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr "Zelfde"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr "Zelfde of leeg"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr "Zelfde of leeg"
 
@@ -1139,7 +1124,7 @@ msgid "Search Payment Orders"
 msgstr "Zoek in betaalopdrachten"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr "Selecteer de boekingen om transacties aan te maken"
@@ -1169,7 +1154,6 @@ msgstr "Selecteer boekingen om transacties aan te maken"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1177,11 +1161,12 @@ msgstr "Staat/Provincie"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr "Status"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr "Gestructureerde referentie"
 
@@ -1197,7 +1182,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1213,13 +1198,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1228,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1236,7 +1221,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1297,8 +1282,8 @@ msgid "Transactions"
 msgstr "Transacties"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1349,7 +1334,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
@@ -1373,5 +1358,17 @@ msgstr "op"
 msgid "otherwise, new payment orders will be created (one per payment mode)."
 msgstr ""
 
+#~ msgid "Due date"
+#~ msgstr "Vervaldatum"
+
+#~ msgid "ISO"
+#~ msgstr "ISO"
+
+#~ msgid "Invoice"
+#~ msgstr "Factuur"
+
+#~ msgid "No Journal Entry on invoice %s"
+#~ msgstr "Geen boekingen van factuur %s"
+
 #~ msgid "Account Entry"
 #~ msgstr "Boeking"
diff --git a/account_payment_order/i18n/nl_BE.po b/account_payment_order/i18n/nl_BE.po
index 2b16f65d1..f41009350 100644
--- a/account_payment_order/i18n/nl_BE.po
+++ b/account_payment_order/i18n/nl_BE.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/nl_NL.po b/account_payment_order/i18n/nl_NL.po
index fd639ab0e..5b18c9e98 100644
--- a/account_payment_order/i18n/nl_NL.po
+++ b/account_payment_order/i18n/nl_NL.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -376,14 +376,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -414,7 +413,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -424,31 +423,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -471,14 +466,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -498,7 +493,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -518,12 +513,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -568,23 +563,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -611,13 +598,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -627,11 +614,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -742,31 +724,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -781,7 +763,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -792,13 +774,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -806,13 +782,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -836,7 +812,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -860,13 +836,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -874,21 +850,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -896,12 +872,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -921,7 +897,7 @@ msgid "Order"
 msgstr "Order"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -974,7 +950,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1027,7 +1003,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1041,7 +1017,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1054,7 +1029,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1065,8 +1040,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1082,24 +1056,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1114,7 +1098,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1144,7 +1128,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1152,11 +1135,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1172,7 +1156,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1188,13 +1172,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1203,7 +1187,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1211,7 +1195,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1272,8 +1256,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1324,7 +1308,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/pl.po b/account_payment_order/i18n/pl.po
index 58fc8a12d..1ebe7bde1 100644
--- a/account_payment_order/i18n/pl.po
+++ b/account_payment_order/i18n/pl.po
@@ -20,13 +20,13 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/pt.po b/account_payment_order/i18n/pt.po
index 069d43f5b..69a210f4d 100644
--- a/account_payment_order/i18n/pt.po
+++ b/account_payment_order/i18n/pt.po
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -63,12 +63,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -103,12 +103,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -118,14 +118,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -154,8 +154,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -180,8 +180,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -225,13 +225,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -243,7 +243,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -293,7 +293,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -373,14 +373,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -411,7 +410,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -421,31 +420,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -468,14 +463,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -495,7 +490,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -515,12 +510,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -565,23 +560,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -608,13 +595,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -624,11 +611,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -739,31 +721,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -778,7 +760,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -789,13 +771,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -803,13 +779,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -833,7 +809,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -857,13 +833,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -871,21 +847,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -893,12 +869,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -918,7 +894,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -971,7 +947,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1024,7 +1000,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1038,7 +1014,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1051,7 +1026,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1062,8 +1037,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1079,24 +1053,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1111,7 +1095,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1141,7 +1125,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1149,11 +1132,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1169,7 +1153,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1185,13 +1169,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1200,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1208,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1269,8 +1253,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1321,7 +1305,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/pt_BR.po b/account_payment_order/i18n/pt_BR.po
index 32c3cb950..d513cd8c1 100644
--- a/account_payment_order/i18n/pt_BR.po
+++ b/account_payment_order/i18n/pt_BR.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr "Banco"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr "Conta bancária"
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -376,14 +376,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -414,7 +413,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -424,31 +423,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr "Provisório"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr "Vence em"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr "Data de vencimento"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -471,14 +466,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -498,7 +493,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -518,12 +513,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 #, fuzzy
 msgid "Free Reference"
 msgstr "Referência estruturada"
@@ -569,23 +564,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -612,13 +599,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -630,11 +617,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr "Ordem de Pagamento"
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr "Fatura"
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -748,31 +730,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr "Movimentação"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr "Data da movimentação"
 
@@ -787,7 +769,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -798,13 +780,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -812,13 +788,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -842,7 +818,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -866,13 +842,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -880,21 +856,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -902,12 +878,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -929,7 +905,7 @@ msgid "Order"
 msgstr "Ordem"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -985,7 +961,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1040,7 +1016,7 @@ msgid "Payment Order"
 msgstr "Ordem de Pagamento"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1054,7 +1030,6 @@ msgid "Payment Orders"
 msgstr "Ordens de Pagamento"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1067,7 +1042,7 @@ msgid "Payment Type"
 msgstr "Tipo de pagamento"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1078,8 +1053,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1095,24 +1069,35 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+#, fuzzy
+msgid "Reference Type"
+msgstr "Referência estruturada"
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr "Linhas relacionadas do pagamento"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1127,7 +1112,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1157,7 +1142,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1165,11 +1149,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr "Status"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr "Referência estruturada"
 
@@ -1185,7 +1170,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr "O total para o parceiro '%s' é negativo ou nulo (%.2f) !"
@@ -1201,13 +1186,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1216,7 +1201,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1224,7 +1209,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1285,8 +1270,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1337,7 +1322,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
@@ -1360,3 +1345,6 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 msgid "otherwise, new payment orders will be created (one per payment mode)."
 msgstr ""
+
+#~ msgid "Invoice"
+#~ msgstr "Fatura"
diff --git a/account_payment_order/i18n/pt_PT.po b/account_payment_order/i18n/pt_PT.po
index 8d01e5edc..c63df5799 100644
--- a/account_payment_order/i18n/pt_PT.po
+++ b/account_payment_order/i18n/pt_PT.po
@@ -20,13 +20,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr "Rascunho"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr "Estado"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/ro.po b/account_payment_order/i18n/ro.po
index 42a8fe2bf..b1e6c0ce2 100644
--- a/account_payment_order/i18n/ro.po
+++ b/account_payment_order/i18n/ro.po
@@ -20,13 +20,13 @@ msgstr ""
 "2:1));\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -374,14 +374,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -412,7 +411,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -422,31 +421,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -469,14 +464,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -496,7 +491,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -516,12 +511,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -566,23 +561,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -625,11 +612,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -740,31 +722,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -779,7 +761,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -790,13 +772,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -804,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -834,7 +810,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -858,13 +834,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -872,21 +848,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -894,12 +870,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -919,7 +895,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -972,7 +948,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1025,7 +1001,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1039,7 +1015,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1052,7 +1027,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1063,8 +1038,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1080,24 +1054,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1112,7 +1096,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1142,7 +1126,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1150,11 +1133,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1170,7 +1154,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1186,13 +1170,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1201,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1209,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1270,8 +1254,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1322,7 +1306,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/ru.po b/account_payment_order/i18n/ru.po
index c08b2192a..68335317c 100644
--- a/account_payment_order/i18n/ru.po
+++ b/account_payment_order/i18n/ru.po
@@ -21,13 +21,13 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -65,12 +65,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -105,12 +105,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -120,14 +120,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -156,8 +156,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -182,8 +182,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -227,13 +227,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -245,7 +245,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -295,7 +295,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -375,14 +375,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -413,7 +412,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -423,31 +422,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -470,14 +465,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -497,7 +492,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -517,12 +512,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -567,23 +562,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -610,13 +597,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -626,11 +613,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -741,31 +723,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -780,7 +762,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -791,13 +773,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -805,13 +781,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -835,7 +811,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -859,13 +835,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -873,21 +849,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -895,12 +871,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -920,7 +896,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -973,7 +949,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1026,7 +1002,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1040,7 +1016,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1053,7 +1028,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1064,8 +1039,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1081,24 +1055,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1113,7 +1097,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1143,7 +1127,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1151,11 +1134,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1171,7 +1155,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1187,13 +1171,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1202,7 +1186,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1210,7 +1194,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1271,8 +1255,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1323,7 +1307,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/sl.po b/account_payment_order/i18n/sl.po
index 28cdd86e8..0cd4530c5 100644
--- a/account_payment_order/i18n/sl.po
+++ b/account_payment_order/i18n/sl.po
@@ -20,13 +20,13 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -64,12 +64,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -104,12 +104,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -119,14 +119,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -155,8 +155,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -181,8 +181,8 @@ msgid "Bank"
 msgstr "Banka"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr "Bančni račun"
@@ -226,13 +226,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -244,7 +244,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -294,7 +294,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -376,14 +376,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -414,7 +413,7 @@ msgid "Display Name"
 msgstr "Prikazni naziv"
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -424,31 +423,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr "Osnutek"
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr "Zapadlost"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr "Datum zapadlosti"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -471,14 +466,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -498,7 +493,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -518,12 +513,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 #, fuzzy
 msgid "Free Reference"
 msgstr "Strukturiran sklic"
@@ -569,23 +564,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -612,13 +599,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -630,11 +617,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr "Plačilni nalog"
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr "Račun"
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -748,31 +730,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr "Premik"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr "Datum premika"
 
@@ -787,7 +769,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -798,13 +780,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -812,13 +788,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -842,7 +818,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -866,13 +842,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -880,21 +856,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -902,12 +878,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -929,7 +905,7 @@ msgid "Order"
 msgstr "Nalog"
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -985,7 +961,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1040,7 +1016,7 @@ msgid "Payment Order"
 msgstr "Plačilni nalog"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1054,7 +1030,6 @@ msgid "Payment Orders"
 msgstr "Plačilni nalogi"
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1067,7 +1042,7 @@ msgid "Payment Type"
 msgstr "Tip plačila"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1078,8 +1053,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1095,24 +1069,35 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+#, fuzzy
+msgid "Reference Type"
+msgstr "Strukturiran sklic"
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr "Povezane plačilne postavke"
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1127,7 +1112,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1157,7 +1142,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1165,11 +1149,12 @@ msgstr "Stanje"
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr "Status"
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr "Strukturiran sklic"
 
@@ -1185,7 +1170,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr "Znesek za partnerja '%s' je negativen ali ničen (%.2f) !"
@@ -1201,13 +1186,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1216,7 +1201,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1224,7 +1209,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1285,8 +1270,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1337,7 +1322,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
@@ -1360,3 +1345,6 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 msgid "otherwise, new payment orders will be created (one per payment mode)."
 msgstr ""
+
+#~ msgid "Invoice"
+#~ msgstr "Račun"
diff --git a/account_payment_order/i18n/th.po b/account_payment_order/i18n/th.po
index 2b5aea38f..4d5969e31 100644
--- a/account_payment_order/i18n/th.po
+++ b/account_payment_order/i18n/th.po
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -63,12 +63,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -103,12 +103,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -118,14 +118,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -154,8 +154,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -180,8 +180,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -225,13 +225,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -243,7 +243,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -293,7 +293,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -373,14 +373,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -411,7 +410,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -421,31 +420,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -468,14 +463,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -495,7 +490,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -515,12 +510,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -565,23 +560,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -608,13 +595,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -624,11 +611,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -739,31 +721,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -778,7 +760,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -789,13 +771,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -803,13 +779,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -833,7 +809,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -857,13 +833,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -871,21 +847,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -893,12 +869,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -918,7 +894,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -971,7 +947,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1024,7 +1000,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1038,7 +1014,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1051,7 +1026,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1062,8 +1037,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1079,24 +1053,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1111,7 +1095,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1141,7 +1125,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1149,11 +1132,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1169,7 +1153,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1185,13 +1169,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1200,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1208,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1269,8 +1253,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1321,7 +1305,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/tr.po b/account_payment_order/i18n/tr.po
index 70fa33e2c..561b2bfc9 100644
--- a/account_payment_order/i18n/tr.po
+++ b/account_payment_order/i18n/tr.po
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -63,12 +63,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -103,12 +103,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -118,14 +118,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -154,8 +154,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -180,8 +180,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -225,13 +225,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -243,7 +243,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -293,7 +293,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -373,14 +373,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -411,7 +410,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -421,31 +420,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -468,14 +463,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -495,7 +490,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -515,12 +510,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -565,23 +560,15 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -608,13 +595,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -624,11 +611,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -739,31 +721,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -778,7 +760,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -789,13 +771,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -803,13 +779,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -833,7 +809,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -857,13 +833,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -871,21 +847,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -893,12 +869,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -918,7 +894,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -971,7 +947,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1024,7 +1000,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1038,7 +1014,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1051,7 +1026,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1062,8 +1037,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1079,24 +1053,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1111,7 +1095,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1141,7 +1125,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1149,11 +1132,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1169,7 +1153,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1185,13 +1169,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1200,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1208,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1269,8 +1253,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1321,7 +1305,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "
diff --git a/account_payment_order/i18n/vi.po b/account_payment_order/i18n/vi.po
index 49c87f822..c2cf6d6f4 100644
--- a/account_payment_order/i18n/vi.po
+++ b/account_payment_order/i18n/vi.po
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:120
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "%d payment lines added to the existing draft payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:115
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "%d payment lines added to the new draft payment order %s which has been "
@@ -63,12 +63,12 @@ msgid "<strong>Used Account:</strong>"
 msgstr ""
 
 #. module: account_payment_order
-#: sql_constraint:account.payment.line:0
+#: model:ir.model.constraint,message:account_payment_order.constraint_account_payment_line_name_company_unique
 msgid "A payment line already exists with this reference in the same company!"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/res_bank.py:16
+#: code:addons/account_payment_order/models/res_bank.py:0
 #, python-format
 msgid ""
 "A valid BIC contains 8 or 11 characters. The BIC '%s' contains %d "
@@ -103,12 +103,12 @@ msgid "Add All Move Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model_terms:ir.ui.view,arch_db:account_payment_order.invoice_supplier_form
+#: model_terms:ir.ui.view,arch_db:account_payment_order.view_move_form
 msgid "Add to Payment Order"
 msgstr ""
 
@@ -118,14 +118,14 @@ msgid "Add to Payment/Debit Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__all
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__all
 msgid "All Entries"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,target_move:0
-#: selection:account.payment.mode,default_target_move:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__target_move__posted
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_target_move__posted
 msgid "All Posted Entries"
 msgstr ""
 
@@ -154,8 +154,8 @@ msgid "Amount in Company Currency"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__any
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__any
 msgid "Any"
 msgstr ""
 
@@ -180,8 +180,8 @@ msgid "Bank"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__bank_account
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Bank Account"
 msgstr ""
@@ -225,13 +225,13 @@ msgid "Bank account on which we should pay the supplier"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:136
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Can not reconcile: no move line for payment line %s of partner '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Cancel"
@@ -243,7 +243,7 @@ msgid "Cancel Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:167
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "Cannot delete a payment order line whose payment order is in state '%s'. You "
@@ -293,7 +293,7 @@ msgid "Confirm Payments"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__open
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Confirmed"
 msgstr ""
@@ -373,14 +373,13 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:458
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:376
-#: code:addons/account_payment_order/models/account_payment_order.py:408
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -411,7 +410,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__done
 msgid "Done"
 msgstr ""
 
@@ -421,31 +420,27 @@ msgid "Done Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__draft
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "Draft"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__due
 msgid "Due"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__due_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__due
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__due
 msgid "Due Date"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__ml_maturity_date
-msgid "Due date"
-msgstr ""
-
-#. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__generated
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Generated"
 msgstr ""
@@ -468,14 +463,14 @@ msgid "File Upload Date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,state:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__uploaded
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 msgid "File Uploaded"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__fixed
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__fixed
 msgid "Fixed Date"
 msgstr ""
 
@@ -495,7 +490,7 @@ msgid "Followers (Partners)"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:150
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid ""
 "For partner '%s', the account of the account move line to pay (%s) is "
@@ -515,12 +510,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line__communication_type__normal
 msgid "Free"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__none
 msgid "Free Reference"
 msgstr ""
 
@@ -565,23 +560,15 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: account_payment_order
-#: selection:account.payment.line,communication_type:0
-msgid "ISO"
-msgstr ""
-
-#. module: account_payment_order
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
+#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -608,13 +595,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_prefered:0
-#: selection:account.payment.order,date_prefered:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_prefered__now
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__date_prefered__now
 msgid "Immediately"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Inbound"
 msgstr ""
@@ -624,11 +611,6 @@ msgstr ""
 msgid "Inbound Payment Order Only"
 msgstr ""
 
-#. module: account_payment_order
-#: model:ir.model,name:account_payment_order.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document
 msgid "Invoice Ref"
@@ -739,31 +721,31 @@ msgid "Messages"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:238
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_line.py:139
+#: code:addons/account_payment_order/models/account_payment_line.py:0
 #, python-format
 msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:243
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_date_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_date_type__move
 msgid "Move"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,date_type:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__move_date
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__date_type__move
 msgid "Move Date"
 msgstr ""
 
@@ -778,7 +760,7 @@ msgid "Move Option"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/bank_payment_line.py:142
+#: code:addons/account_payment_order/models/bank_payment_line.py:0
 #, python-format
 msgid "Move line '%s' of partner '%s' has already been reconciled"
 msgstr ""
@@ -789,13 +771,7 @@ msgid "Name or Description"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:76
-#, python-format
-msgid "No Journal Entry on invoice %s"
-msgstr ""
-
-#. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:87
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid ""
 "No Payment Line created for invoice %s because it already exists or because "
@@ -803,13 +779,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:93
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
 msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:325
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -833,7 +809,7 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: account_payment_order
@@ -857,13 +833,13 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:143
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:110
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must choose an option for the 'Move Option' "
@@ -871,21 +847,21 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:100
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Account'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:105
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select a value for the 'Transfer Journal'."
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_mode.py:94
+#: code:addons/account_payment_order/models/account_payment_mode.py:0
 #, python-format
 msgid ""
 "On the payment mode '%s', you must select an option for the 'Offsetting "
@@ -893,12 +869,12 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__date
 msgid "One move per payment date"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,move_option:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__move_option__line
 msgid "One move per payment line"
 msgstr ""
 
@@ -918,7 +894,7 @@ msgid "Order"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.order,payment_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "Outbound"
 msgstr ""
@@ -971,7 +947,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:345
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -1024,7 +1000,7 @@ msgid "Payment Order"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__payment_order_ok
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok
 msgid "Payment Order Ok"
 msgstr ""
 
@@ -1038,7 +1014,6 @@ msgid "Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_invoice__reference_type
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__name
 msgid "Payment Reference"
 msgstr ""
@@ -1051,7 +1026,7 @@ msgid "Payment Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:456
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
@@ -1062,8 +1037,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:374
-#: code:addons/account_payment_order/models/account_payment_order.py:406
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -1079,24 +1053,34 @@ msgstr ""
 msgid "Post Move"
 msgstr ""
 
+#. module: account_payment_order
+#: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type
+msgid "Reference Type"
+msgstr ""
+
 #. module: account_payment_order
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form
 msgid "Related Payment Lines"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: account_payment_order
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
 msgid "Same"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.line.create,payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same_or_null
 msgid "Same or Empty"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,default_payment_mode:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same_or_null
 msgid "Same or empty"
 msgstr ""
 
@@ -1111,7 +1095,7 @@ msgid "Search Payment Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/wizard/account_payment_line_create.py:130
+#: code:addons/account_payment_order/wizard/account_payment_line_create.py:0
 #, python-format
 msgid "Select Move Lines to Create Transactions"
 msgstr ""
@@ -1141,7 +1125,6 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state
-#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search
 #: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search
 msgid "State"
@@ -1149,11 +1132,12 @@ msgstr ""
 
 #. module: account_payment_order
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state
+#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state
 msgid "Status"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.invoice,reference_type:0
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_move__reference_type__structured
 msgid "Structured Reference"
 msgstr ""
 
@@ -1169,7 +1153,7 @@ msgid "Technical model for printing payment order"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:308
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -1185,13 +1169,13 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_invoice.py:73
+#: code:addons/account_payment_order/models/account_move.py:0
 #, python-format
-msgid "The invoice %s is not in Open state"
+msgid "The invoice %s is not in Posted state"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:272
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -1200,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:130
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1208,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:247
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1269,8 +1253,8 @@ msgid "Transactions"
 msgstr ""
 
 #. module: account_payment_order
-#: selection:account.payment.mode,offsetting_account:0
 #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__transfer_account_id
+#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__offsetting_account__transfer_account
 msgid "Transfer Account"
 msgstr ""
 
@@ -1321,7 +1305,7 @@ msgid "Wizard to create payment lines"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:118
+#: code:addons/account_payment_order/models/account_payment_order.py:0
 #, python-format
 msgid ""
 "You cannot delete an uploaded payment order. You can cancel it in order to "