retour PR

This commit is contained in:
Jonathan lescaut 2024-03-29 11:06:42 +01:00
parent 101f16f7b3
commit 930ff0d905
2 changed files with 3 additions and 3 deletions

View file

@ -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);

View file

@ -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') {