From 9a3a41202a68ac43531f16f63c1e505149cdee66 Mon Sep 17 00:00:00 2001 From: niyasraphy Date: Wed, 21 Dec 2022 02:26:45 +0000 Subject: [PATCH] [FIX] purchase_requisition, stock: improve usererror to show allowed stages in purchase_requisition and stock module, when deleting a requisition and move, the raised warning says,the deletion can be done only in draft moves, where us the deletion is allowed for the cancelled records also. improving the user error message to include the cancelled records in the message. closes odoo/odoo#110340 X-original-commit: b71d298dabb4436182c0eb516d5a7b7e76fca437 Signed-off-by: William Henrotin (whe) --- addons/purchase_requisition/i18n/purchase_requisition.pot | 2 +- addons/purchase_requisition/models/purchase_requisition.py | 2 +- addons/stock/i18n/stock.pot | 2 +- addons/stock/models/stock_move.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot index 6fb547dc15a..4ee334f16af 100644 --- a/addons/purchase_requisition/i18n/purchase_requisition.pot +++ b/addons/purchase_requisition/i18n/purchase_requisition.pot @@ -1100,7 +1100,7 @@ msgstr "" #. module: purchase_requisition #: code:addons/purchase_requisition/models/purchase_requisition.py:0 #, python-format -msgid "You can only delete draft requisitions." +msgid "You can only delete draft or cancelled requisitions." msgstr "" #. module: purchase_requisition diff --git a/addons/purchase_requisition/models/purchase_requisition.py b/addons/purchase_requisition/models/purchase_requisition.py index b158bdcb854..084d1a713fc 100644 --- a/addons/purchase_requisition/models/purchase_requisition.py +++ b/addons/purchase_requisition/models/purchase_requisition.py @@ -153,7 +153,7 @@ class PurchaseRequisition(models.Model): @api.ondelete(at_uninstall=False) def _unlink_if_draft_or_cancel(self): if any(requisition.state not in ('draft', 'cancel') for requisition in self): - raise UserError(_('You can only delete draft requisitions.')) + raise UserError(_('You can only delete draft or cancelled requisitions.')) def unlink(self): # Draft requisitions could have some requisition lines. diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot index 5a4b63ce83b..197141532fb 100644 --- a/addons/stock/i18n/stock.pot +++ b/addons/stock/i18n/stock.pot @@ -9044,7 +9044,7 @@ msgstr "" #. module: stock #: code:addons/stock/models/stock_move.py:0 #, python-format -msgid "You can only delete draft moves." +msgid "You can only delete draft or cancelled moves." msgstr "" #. module: stock diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py index 2660f9e2272..38784c0509c 100644 --- a/addons/stock/models/stock_move.py +++ b/addons/stock/models/stock_move.py @@ -1804,7 +1804,7 @@ Please change the quantity done or the rounding precision of your unit of measur @api.ondelete(at_uninstall=False) def _unlink_if_draft_or_cancel(self): if any(move.state not in ('draft', 'cancel') for move in self): - raise UserError(_('You can only delete draft moves.')) + raise UserError(_('You can only delete draft or cancelled moves.')) def unlink(self): # With the non plannified picking, draft moves could have some move lines.