From 930ff0d905edcd183d4f0234d2bf69f47213128d Mon Sep 17 00:00:00 2001 From: Jonathan lescaut Date: Fri, 29 Mar 2024 11:06:42 +0100 Subject: [PATCH] retour PR --- htdocs/core/actions_massactions.inc.php | 2 +- htdocs/core/tpl/massactions_pre.tpl.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index b485f7d8b0f..d245ca62708 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -1544,7 +1544,7 @@ if (!$error && ($massaction == 'affectcommercial' || ($action == 'affectcommerci } } -if (!$error && ($massaction == 'Unassigncommercial' || ($action == 'Unassigncommercial' && $confirm == 'yes')) && $permissiontoadd) { +if (!$error && ($massaction == 'unassigncommercial' || ($action == 'unassigncommercial' && $confirm == 'yes')) && $permissiontoadd) { $db->begin(); $objecttmp = new $objectclass($db); diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php index d27b1f9c0f5..d479a223a12 100644 --- a/htdocs/core/tpl/massactions_pre.tpl.php +++ b/htdocs/core/tpl/massactions_pre.tpl.php @@ -398,10 +398,10 @@ if ($massaction == 'unsetcommercial') { $formquestion = array(); $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, 'AND u.statut = 1', 0, '', '', 0, 1); $formquestion[] = array('type' => 'other', - 'name' => 'Unassigncommercial', + 'name' => 'unassigncommercial', 'label' => $form->editfieldkey('UnallocateCommercial', 'commercial_id', '', $object, 0), 'value' => $form->multiselectarray('commercial', $userlist, null, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0, '', '', '', 1)); - print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmUnallocateCommercial"), $langs->trans("ConfirmUnallocateCommercialQuestion", count($toselect)), "Unassigncommercial", $formquestion, 1, 0, 200, 500, 1); + print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmUnallocateCommercial"), $langs->trans("ConfirmUnallocateCommercialQuestion", count($toselect)), "unassigncommercial", $formquestion, 1, 0, 200, 500, 1); } if ($massaction == 'preapproveleave') {