diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 350674370e9..aa13e9607e6 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -1374,7 +1374,7 @@ if ($resql) { } $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; - $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields + $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields $selectedfields .= $form->showCheckAddButtons('checkforselect', 1); if (GETPOST('autoselectall', 'int')) { @@ -1391,6 +1391,14 @@ if ($resql) { print '
| '; + $searchpicto = $form->showFilterButtons('left'); + print $searchpicto; + print ' | '; + } + // Ref if (!empty($arrayfields['c.ref']['checked'])) { print ''; @@ -1643,15 +1651,20 @@ if ($resql) { print ' | '; } // Action column - print ''; - $searchpicto = $form->showFilterButtons(); - print $searchpicto; - print ' | '; - + if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) { + print ''; + $searchpicto = $form->showFilterButtons(); + print $searchpicto; + print ' | '; + } print "
| '; + if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined + $selected = 0; + if (in_array($obj->rowid, $arrayofselected)) { + $selected = 1; + } + print ''; + } + } + // Ref if (!empty($arrayfields['c.ref']['checked'])) { print ' | '; @@ -2435,13 +2462,15 @@ if ($resql) { } // Action column - print ' | '; - if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined - $selected = 0; - if (in_array($obj->rowid, $arrayofselected)) { - $selected = 1; + if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) { + print ' | '; + if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined + $selected = 0; + if (in_array($obj->rowid, $arrayofselected)) { + $selected = 1; + } + print ''; } - print ''; } print ' | '; if (!$i) {