diff --git a/account_payment_order/i18n/de.po b/account_payment_order/i18n/de.po
index 331be0422..0c3201122 100644
--- a/account_payment_order/i18n/de.po
+++ b/account_payment_order/i18n/de.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bank-payment (10.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 01:24+0000\n"
-"PO-Revision-Date: 2017-06-01 00:37+0000\n"
+"POT-Creation-Date: 2017-08-03 00:38+0000\n"
+"PO-Revision-Date: 2017-08-03 11:22+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: German (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,14 @@ msgstr "Abbruch"
 msgid "Cancel Payments"
 msgstr "Zahlungen abbrechen"
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/bank_payment_line.py:164
+#, python-format
+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
 #: model:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Choose Move Lines Filter Options"
@@ -319,14 +327,14 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:412
+#: code:addons/account_payment_order/models/account_payment_order.py:431
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:341
-#: code:addons/account_payment_order/models/account_payment_order.py:362
+#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:381
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -589,7 +597,7 @@ msgid "Linked to an Invoice or Refund"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:209
+#: code:addons/account_payment_order/models/account_payment_order.py:228
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
@@ -601,7 +609,7 @@ msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:214
+#: code:addons/account_payment_order/models/account_payment_order.py:233
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
@@ -654,7 +662,7 @@ msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:290
+#: code:addons/account_payment_order/models/account_payment_order.py:309
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -677,7 +685,7 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:115
+#: code:addons/account_payment_order/models/account_payment_order.py:124
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
@@ -777,7 +785,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:310
+#: code:addons/account_payment_order/models/account_payment_order.py:329
 #, python-format
 msgid "Payment File"
 msgstr "Zahlungsdatei"
@@ -844,14 +852,14 @@ msgid "Payment Type"
 msgstr "Zahlungsart"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:410
+#: code:addons/account_payment_order/models/account_payment_order.py:429
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:339
-#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:358
+#: code:addons/account_payment_order/models/account_payment_order.py:379
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -953,7 +961,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:273
+#: code:addons/account_payment_order/models/account_payment_order.py:292
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -983,7 +991,7 @@ msgid "The invoice %s is not in Open state"
 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:262
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -992,7 +1000,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:102
+#: code:addons/account_payment_order/models/account_payment_order.py:111
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1000,7 +1008,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:218
+#: code:addons/account_payment_order/models/account_payment_order.py:237
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1079,6 +1087,14 @@ msgstr ""
 msgid "Wizard to create payment lines"
 msgstr ""
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/account_payment_order.py:99
+#, python-format
+msgid ""
+"You cannot delete an uploaded payment order. You can cancel it in order to "
+"do so."
+msgstr ""
+
 #. module: account_payment_order
 #: model:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 msgid ""
diff --git a/account_payment_order/i18n/es.po b/account_payment_order/i18n/es.po
index 13baba376..f1bc3fe91 100644
--- a/account_payment_order/i18n/es.po
+++ b/account_payment_order/i18n/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bank-payment (10.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 01:24+0000\n"
-"PO-Revision-Date: 2017-06-01 00:37+0000\n"
+"POT-Creation-Date: 2017-08-03 00:38+0000\n"
+"PO-Revision-Date: 2017-08-03 11:22+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,14 @@ msgstr "Cancelar"
 msgid "Cancel Payments"
 msgstr "Cancelar pagos"
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/bank_payment_line.py:164
+#, python-format
+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
 #: model:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Choose Move Lines Filter Options"
@@ -319,14 +327,14 @@ msgid "Debit Orders"
 msgstr "Órdenes de cobro"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:412
+#: code:addons/account_payment_order/models/account_payment_order.py:431
 #, 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:341
-#: code:addons/account_payment_order/models/account_payment_order.py:362
+#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:381
 #, python-format
 msgid "Debit order %s"
 msgstr "Orden de cobro %s"
@@ -589,7 +597,7 @@ msgid "Linked to an Invoice or Refund"
 msgstr "Vinculado a una factura o factura rectificativa"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:209
+#: code:addons/account_payment_order/models/account_payment_order.py:228
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr "No se ha establecido el diario de banco en la orden %s."
@@ -601,7 +609,7 @@ 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:214
+#: code:addons/account_payment_order/models/account_payment_order.py:233
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
@@ -654,7 +662,7 @@ 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:290
+#: code:addons/account_payment_order/models/account_payment_order.py:309
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -677,7 +685,7 @@ msgid "Offsetting Account"
 msgstr "Cuenta de compensación"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:115
+#: code:addons/account_payment_order/models/account_payment_order.py:124
 #, 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)."
@@ -777,7 +785,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:310
+#: code:addons/account_payment_order/models/account_payment_order.py:329
 #, python-format
 msgid "Payment File"
 msgstr "Archivo de remesa"
@@ -844,14 +852,14 @@ msgid "Payment Type"
 msgstr "Tipo de pago"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:410
+#: code:addons/account_payment_order/models/account_payment_order.py:429
 #, python-format
 msgid "Payment bank line %s"
 msgstr "Línea de pago bancario %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:339
-#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:358
+#: code:addons/account_payment_order/models/account_payment_order.py:379
 #, python-format
 msgid "Payment order %s"
 msgstr "Orden %s"
@@ -953,7 +961,7 @@ msgid "Target Moves"
 msgstr "Asientos destino"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:273
+#: code:addons/account_payment_order/models/account_payment_order.py:292
 #, 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) !"
@@ -983,7 +991,7 @@ msgid "The invoice %s is not in Open state"
 msgstr "La factura %s no está en estado abierta"
 
 #. 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:262
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -992,7 +1000,7 @@ msgid ""
 msgstr "El modo de pago '%s' tiene la opción 'No permitir adeudo antes de la fecha de vencimiento'. La línea de pago %s tiene una fecha de vencimiento %s que es después de la fecha de pago calculada %s."
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:102
+#: code:addons/account_payment_order/models/account_payment_order.py:111
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1000,7 +1008,7 @@ msgid ""
 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:218
+#: code:addons/account_payment_order/models/account_payment_order.py:237
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr "No hay transacciones en la orden %s."
@@ -1079,6 +1087,14 @@ msgstr "Filtro de tipo de fecha"
 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:99
+#, python-format
+msgid ""
+"You cannot delete an uploaded payment order. You can cancel it in order to "
+"do so."
+msgstr ""
+
 #. module: account_payment_order
 #: model:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 msgid ""
diff --git a/account_payment_order/i18n/nb_NO.po b/account_payment_order/i18n/nb_NO.po
index 8a3849642..442f1b415 100644
--- a/account_payment_order/i18n/nb_NO.po
+++ b/account_payment_order/i18n/nb_NO.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bank-payment (10.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 01:24+0000\n"
-"PO-Revision-Date: 2017-06-01 00:37+0000\n"
+"POT-Creation-Date: 2017-08-03 00:38+0000\n"
+"PO-Revision-Date: 2017-08-03 11:22+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,14 @@ msgstr "Lukk"
 msgid "Cancel Payments"
 msgstr "Kanseller betalinger"
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/bank_payment_line.py:164
+#, python-format
+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
 #: model:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Choose Move Lines Filter Options"
@@ -317,14 +325,14 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:412
+#: code:addons/account_payment_order/models/account_payment_order.py:431
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:341
-#: code:addons/account_payment_order/models/account_payment_order.py:362
+#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:381
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -587,7 +595,7 @@ msgid "Linked to an Invoice or Refund"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:209
+#: code:addons/account_payment_order/models/account_payment_order.py:228
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
@@ -599,7 +607,7 @@ msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:214
+#: code:addons/account_payment_order/models/account_payment_order.py:233
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
@@ -652,7 +660,7 @@ msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:290
+#: code:addons/account_payment_order/models/account_payment_order.py:309
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -675,7 +683,7 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:115
+#: code:addons/account_payment_order/models/account_payment_order.py:124
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
@@ -775,7 +783,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:310
+#: code:addons/account_payment_order/models/account_payment_order.py:329
 #, python-format
 msgid "Payment File"
 msgstr "Betalingsfil"
@@ -842,14 +850,14 @@ msgid "Payment Type"
 msgstr "Betalingstype"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:410
+#: code:addons/account_payment_order/models/account_payment_order.py:429
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:339
-#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:358
+#: code:addons/account_payment_order/models/account_payment_order.py:379
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -951,7 +959,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:273
+#: code:addons/account_payment_order/models/account_payment_order.py:292
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -981,7 +989,7 @@ msgid "The invoice %s is not in Open state"
 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:262
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -990,7 +998,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:102
+#: code:addons/account_payment_order/models/account_payment_order.py:111
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -998,7 +1006,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:218
+#: code:addons/account_payment_order/models/account_payment_order.py:237
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1077,6 +1085,14 @@ msgstr ""
 msgid "Wizard to create payment lines"
 msgstr ""
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/account_payment_order.py:99
+#, python-format
+msgid ""
+"You cannot delete an uploaded payment order. You can cancel it in order to "
+"do so."
+msgstr ""
+
 #. module: account_payment_order
 #: model:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 msgid ""
diff --git a/account_payment_order/i18n/nl.po b/account_payment_order/i18n/nl.po
index ef6929bdb..7d6b86223 100644
--- a/account_payment_order/i18n/nl.po
+++ b/account_payment_order/i18n/nl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bank-payment (10.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 01:24+0000\n"
-"PO-Revision-Date: 2017-06-01 00:37+0000\n"
+"POT-Creation-Date: 2017-08-03 00:38+0000\n"
+"PO-Revision-Date: 2017-08-03 11:22+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,14 @@ msgstr "Annuleren"
 msgid "Cancel Payments"
 msgstr "Annuleer betalingen"
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/bank_payment_line.py:164
+#, python-format
+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
 #: model:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Choose Move Lines Filter Options"
@@ -319,14 +327,14 @@ msgid "Debit Orders"
 msgstr "Betaalopdrachten"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:412
+#: code:addons/account_payment_order/models/account_payment_order.py:431
 #, 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:341
-#: code:addons/account_payment_order/models/account_payment_order.py:362
+#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:381
 #, python-format
 msgid "Debit order %s"
 msgstr "Betaalopdrachten %s"
@@ -589,7 +597,7 @@ msgid "Linked to an Invoice or Refund"
 msgstr "Gekoppeld aan een factuur of credit factuur"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:209
+#: code:addons/account_payment_order/models/account_payment_order.py:228
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr "Ontbrekend bankboek op betaalopdracht %s."
@@ -601,7 +609,7 @@ 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:214
+#: code:addons/account_payment_order/models/account_payment_order.py:233
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
@@ -654,7 +662,7 @@ 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:290
+#: code:addons/account_payment_order/models/account_payment_order.py:309
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -677,7 +685,7 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:115
+#: code:addons/account_payment_order/models/account_payment_order.py:124
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
@@ -777,7 +785,7 @@ msgid "Payment Execution Date Type"
 msgstr "Betaaldatum soort"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:310
+#: code:addons/account_payment_order/models/account_payment_order.py:329
 #, python-format
 msgid "Payment File"
 msgstr "Betaalbestand"
@@ -844,14 +852,14 @@ msgid "Payment Type"
 msgstr "Betaalwijze"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:410
+#: code:addons/account_payment_order/models/account_payment_order.py:429
 #, python-format
 msgid "Payment bank line %s"
 msgstr "Betaalregel %s"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:339
-#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:358
+#: code:addons/account_payment_order/models/account_payment_order.py:379
 #, python-format
 msgid "Payment order %s"
 msgstr "Betaalopdracht %s"
@@ -953,7 +961,7 @@ msgid "Target Moves"
 msgstr "Welke mutaties"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:273
+#: code:addons/account_payment_order/models/account_payment_order.py:292
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr ""
@@ -983,7 +991,7 @@ msgid "The invoice %s is not in Open state"
 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:262
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -992,7 +1000,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:102
+#: code:addons/account_payment_order/models/account_payment_order.py:111
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -1000,7 +1008,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:218
+#: code:addons/account_payment_order/models/account_payment_order.py:237
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1079,6 +1087,14 @@ msgstr "Soort datumfilter"
 msgid "Wizard to create payment lines"
 msgstr ""
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/account_payment_order.py:99
+#, python-format
+msgid ""
+"You cannot delete an uploaded payment order. You can cancel it in order to "
+"do so."
+msgstr ""
+
 #. module: account_payment_order
 #: model:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 msgid ""
diff --git a/account_payment_order/i18n/pt_BR.po b/account_payment_order/i18n/pt_BR.po
index 43f54f4ae..fa7822236 100644
--- a/account_payment_order/i18n/pt_BR.po
+++ b/account_payment_order/i18n/pt_BR.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bank-payment (10.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 01:24+0000\n"
-"PO-Revision-Date: 2017-06-01 00:37+0000\n"
+"POT-Creation-Date: 2017-08-03 00:38+0000\n"
+"PO-Revision-Date: 2017-08-03 11:22+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,14 @@ msgstr "Cancelar"
 msgid "Cancel Payments"
 msgstr ""
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/bank_payment_line.py:164
+#, python-format
+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
 #: model:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Choose Move Lines Filter Options"
@@ -317,14 +325,14 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:412
+#: code:addons/account_payment_order/models/account_payment_order.py:431
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:341
-#: code:addons/account_payment_order/models/account_payment_order.py:362
+#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:381
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -587,7 +595,7 @@ msgid "Linked to an Invoice or Refund"
 msgstr "Vinculado a uma fatura ou reembolso"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:209
+#: code:addons/account_payment_order/models/account_payment_order.py:228
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
@@ -599,7 +607,7 @@ msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:214
+#: code:addons/account_payment_order/models/account_payment_order.py:233
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
@@ -652,7 +660,7 @@ msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:290
+#: code:addons/account_payment_order/models/account_payment_order.py:309
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -675,7 +683,7 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:115
+#: code:addons/account_payment_order/models/account_payment_order.py:124
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
@@ -775,7 +783,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:310
+#: code:addons/account_payment_order/models/account_payment_order.py:329
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -842,14 +850,14 @@ msgid "Payment Type"
 msgstr "Tipo de pagamento"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:410
+#: code:addons/account_payment_order/models/account_payment_order.py:429
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:339
-#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:358
+#: code:addons/account_payment_order/models/account_payment_order.py:379
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -951,7 +959,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:273
+#: code:addons/account_payment_order/models/account_payment_order.py:292
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr "O total para o parceiro '%s' é negativo ou nulo (%.2f) !"
@@ -981,7 +989,7 @@ msgid "The invoice %s is not in Open state"
 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:262
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -990,7 +998,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:102
+#: code:addons/account_payment_order/models/account_payment_order.py:111
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -998,7 +1006,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:218
+#: code:addons/account_payment_order/models/account_payment_order.py:237
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1077,6 +1085,14 @@ msgstr "Tipo de filtro de data"
 msgid "Wizard to create payment lines"
 msgstr ""
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/account_payment_order.py:99
+#, python-format
+msgid ""
+"You cannot delete an uploaded payment order. You can cancel it in order to "
+"do so."
+msgstr ""
+
 #. module: account_payment_order
 #: model:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 msgid ""
diff --git a/account_payment_order/i18n/sl.po b/account_payment_order/i18n/sl.po
index e90ec5711..ee2519bc5 100644
--- a/account_payment_order/i18n/sl.po
+++ b/account_payment_order/i18n/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bank-payment (10.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 01:24+0000\n"
-"PO-Revision-Date: 2017-06-01 00:37+0000\n"
+"POT-Creation-Date: 2017-08-03 00:38+0000\n"
+"PO-Revision-Date: 2017-08-03 11:22+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Slovenian (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -200,6 +200,14 @@ msgstr "Preklic"
 msgid "Cancel Payments"
 msgstr ""
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/bank_payment_line.py:164
+#, python-format
+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
 #: model:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form
 msgid "Choose Move Lines Filter Options"
@@ -317,14 +325,14 @@ msgid "Debit Orders"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:412
+#: code:addons/account_payment_order/models/account_payment_order.py:431
 #, python-format
 msgid "Debit bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:341
-#: code:addons/account_payment_order/models/account_payment_order.py:362
+#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:381
 #, python-format
 msgid "Debit order %s"
 msgstr ""
@@ -587,7 +595,7 @@ msgid "Linked to an Invoice or Refund"
 msgstr "Vezano na račun ali vračilo"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:209
+#: code:addons/account_payment_order/models/account_payment_order.py:228
 #, python-format
 msgid "Missing Bank Journal on payment order %s."
 msgstr ""
@@ -599,7 +607,7 @@ msgid "Missing Partner Bank Account on payment line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:214
+#: code:addons/account_payment_order/models/account_payment_order.py:233
 #, python-format
 msgid "Missing bank account on bank journal '%s'."
 msgstr ""
@@ -652,7 +660,7 @@ msgid "No Payment Mode on invoice %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:290
+#: code:addons/account_payment_order/models/account_payment_order.py:309
 #, python-format
 msgid ""
 "No handler for this payment method. Maybe you haven't installed the related "
@@ -675,7 +683,7 @@ msgid "Offsetting Account"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:115
+#: code:addons/account_payment_order/models/account_payment_order.py:124
 #, python-format
 msgid "On payment order %s, the Payment Execution Date is in the past (%s)."
 msgstr ""
@@ -775,7 +783,7 @@ msgid "Payment Execution Date Type"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:310
+#: code:addons/account_payment_order/models/account_payment_order.py:329
 #, python-format
 msgid "Payment File"
 msgstr ""
@@ -842,14 +850,14 @@ msgid "Payment Type"
 msgstr "Tip plačila"
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:410
+#: code:addons/account_payment_order/models/account_payment_order.py:429
 #, python-format
 msgid "Payment bank line %s"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:339
-#: code:addons/account_payment_order/models/account_payment_order.py:360
+#: code:addons/account_payment_order/models/account_payment_order.py:358
+#: code:addons/account_payment_order/models/account_payment_order.py:379
 #, python-format
 msgid "Payment order %s"
 msgstr ""
@@ -951,7 +959,7 @@ msgid "Target Moves"
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:273
+#: code:addons/account_payment_order/models/account_payment_order.py:292
 #, python-format
 msgid "The amount for Partner '%s' is negative or null (%.2f) !"
 msgstr "Znesek za partnerja '%s' je negativen ali ničen (%.2f) !"
@@ -981,7 +989,7 @@ msgid "The invoice %s is not in Open state"
 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:262
 #, python-format
 msgid ""
 "The payment mode '%s' has the option 'Disallow Debit Before Maturity Date'. "
@@ -990,7 +998,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:102
+#: code:addons/account_payment_order/models/account_payment_order.py:111
 #, python-format
 msgid ""
 "The payment type (%s) is not the same as the payment type of the payment "
@@ -998,7 +1006,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_order
-#: code:addons/account_payment_order/models/account_payment_order.py:218
+#: code:addons/account_payment_order/models/account_payment_order.py:237
 #, python-format
 msgid "There are no transactions on payment order %s."
 msgstr ""
@@ -1077,6 +1085,14 @@ msgstr "Tip datumskega filtra"
 msgid "Wizard to create payment lines"
 msgstr ""
 
+#. module: account_payment_order
+#: code:addons/account_payment_order/models/account_payment_order.py:99
+#, python-format
+msgid ""
+"You cannot delete an uploaded payment order. You can cancel it in order to "
+"do so."
+msgstr ""
+
 #. module: account_payment_order
 #: model:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form
 msgid ""