diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index cafb93a4091..74852da84f7 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1049,8 +1049,9 @@ 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++;
- $resaction .= '
'.$langs->trans('ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted', $objecttmp->ref).'
';
+ $TMsg[] = ''.$langs->trans('ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted', $objecttmp->ref).'
';
continue;
}
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 '';
}
- if ($object->isService() && $conf->workstation->enabled) {
+ if ($object->isService() && isModEnabled('workstation')) {
$workstation = new Workstation($db);
$res = $workstation->fetch($object->fk_default_workstation);