From f539f0ee5432e3ec165bade0d5e3cbd56d3a7d60 Mon Sep 17 00:00:00 2001
From: niyasraphy <niyasraphyk@gmail.com>
Date: Sat, 18 Feb 2023 14:29:47 +0000
Subject: [PATCH] [FIX] repair: hide cancel button in done state
before this commit, the cancel button is visible in the done state and on clicking showing the validation that it cannot be cancelled.
by the commit: https://github.com/odoo/odoo/commit/8d37cf462badc25d911d3fa6d3382c6f7418904f one of the cancel button in the form is made hidden in the done state, similarly applying for the other cancel button also.
also currently on trying to delete a done repair order, it says to cancel first and then delete the order, from the commit: https://github.com/odoo/odoo/commit/8d37cf462badc25d911d3fa6d3382c6f7418904f cancelling a done record is prevented, thus modifying the warning message and its related pot file
after this commit, the cancel button will not be visible in the done state.
closes odoo/odoo#113076
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
---
addons/repair/i18n/repair.pot | 6 ++++++
addons/repair/models/repair.py | 2 ++
addons/repair/views/repair_views.xml | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/addons/repair/i18n/repair.pot b/addons/repair/i18n/repair.pot
index 49d429b120d0..ead7284a0eec 100644
--- a/addons/repair/i18n/repair.pot
+++ b/addons/repair/i18n/repair.pot
@@ -1277,6 +1277,12 @@ msgstr ""
msgid "You cannot cancel a completed repair order."
msgstr ""
+#. module: repair
+#: code:addons/repair/models/repair.py:0
+#, python-format
+msgid "You cannot delete a completed repair order."
+msgstr ""
+
#. module: repair
#: code:addons/repair/models/repair.py:0 code:addons/repair/models/repair.py:0
#, python-format
diff --git a/addons/repair/models/repair.py b/addons/repair/models/repair.py
index 998a5587b181..f99aba4230d7 100644
--- a/addons/repair/models/repair.py
+++ b/addons/repair/models/repair.py
@@ -202,6 +202,8 @@ class Repair(models.Model):
def unlink(self):
for order in self:
+ if order.state == 'done':
+ raise UserError(_('You cannot delete a completed repair order.'))
if order.state not in ('draft', 'cancel'):
raise UserError(_('You can not delete a repair order once it has been confirmed. You must first cancel it.'))
if order.state == 'cancel' and order.invoice_id and order.invoice_id.posted_before:
diff --git a/addons/repair/views/repair_views.xml b/addons/repair/views/repair_views.xml
index ed9ce713ed09..6fe93556344a 100644
--- a/addons/repair/views/repair_views.xml
+++ b/addons/repair/views/repair_views.xml
@@ -37,7 +37,7 @@
<button name="action_send_mail" states="draft" string="Send Quotation" type="object"/>
<button name="print_repair_order" states="draft" string="Print Quotation" type="object"/>
<button name="action_repair_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
- <button name="action_repair_cancel" string="Cancel Repair" type="object" confirm="Draft invoices for this order will be cancelled. Do you confirm the action?" attrs="{'invisible':['|', ('state', '=', 'cancel'), ('invoice_state', '!=', 'draft')]}"/>
+ <button name="action_repair_cancel" string="Cancel Repair" type="object" confirm="Draft invoices for this order will be cancelled. Do you confirm the action?" attrs="{'invisible':['|', ('state','in', ('cancel','done')), ('invoice_state', '!=', 'draft')]}"/>
<button name="action_repair_cancel" string="Cancel Repair" type="object" attrs="{'invisible': ['|', ('state','in', ('cancel','done')), ('invoice_state', '=', 'draft')]}"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done"/>
</header>
--
GitLab