From 1a6342bb2a188a50363d1b2a6eb4732ce9d80636 Mon Sep 17 00:00:00 2001
From: Milen Karaganski <milen@blacktiehost.com>
Date: Tue, 6 Dec 2022 23:51:28 +0200
Subject: [PATCH 1/3] FIX|Fix[#23117]

Error message not displayed, when trying to mass-delete validated OR approved holiday requests
---
 htdocs/core/actions_massactions.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index ec2ecabcf0d..49f201799b5 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1049,8 +1049,8 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 			}
 
 			if ($objectclass == 'Holiday' && ! in_array($objecttmp->statut, array(Holiday::STATUS_DRAFT, Holiday::STATUS_CANCELED, Holiday::STATUS_REFUSED))) {
-				$nbignored++;
-				$resaction .= '<div class="error">'.$langs->trans('ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted', $objecttmp->ref).'</div><br>';
+				$langs->load("errors");
+				$TMsg[] = '<div class="error">'.$langs->trans('ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted', $objecttmp->ref).'</div><br>';
 				continue;
 			}
 

From 4ba0283e0b0454fc13817409e1c2b57bd672ef86 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 7 Dec 2022 09:59:30 +0100
Subject: [PATCH 2/3] FIX - PHP Warning and use isModEnabled

---
 htdocs/product/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index c1be61741bb..8f1f6061861 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2528,7 +2528,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td>';
 			}
 
-			if ($object->isService() && $conf->workstation->enabled) {
+			if ($object->isService() && isModEnabled('workstation')) {
 				$workstation = new Workstation($db);
 				$res = $workstation->fetch($object->fk_default_workstation);
 

From 3757760d776e41f16f67560479bab875ad7f3ad8 Mon Sep 17 00:00:00 2001
From: Milen Karaganski <milen@blacktiehost.com>
Date: Wed, 7 Dec 2022 17:10:43 +0200
Subject: [PATCH 3/3] Put back error counter $nbignored++;

---
 htdocs/core/actions_massactions.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 49f201799b5..a5a85bf07f6 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1050,6 +1050,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 
 			if ($objectclass == 'Holiday' && ! in_array($objecttmp->statut, array(Holiday::STATUS_DRAFT, Holiday::STATUS_CANCELED, Holiday::STATUS_REFUSED))) {
 				$langs->load("errors");
+				$nbignored++;
 				$TMsg[] = '<div class="error">'.$langs->trans('ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted', $objecttmp->ref).'</div><br>';
 				continue;
 			}