diff --git a/htdocs/categories/categorie_list.php b/htdocs/categories/categorie_list.php index 3543b57c6bb..2b0c1ba3467 100644 --- a/htdocs/categories/categorie_list.php +++ b/htdocs/categories/categorie_list.php @@ -56,6 +56,9 @@ $groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT); +if (is_numeric($type)) { + $type = Categorie::$MAP_ID_TO_CODE[$type]; +} // Load variable for pagination $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; @@ -545,7 +548,7 @@ if (!empty($moreforfilter)) { } $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column ? 'left' : ''); // This also change content of $arrayfields with user setup +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields with user setup $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 451360ccaaf..6910a7bf917 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -1343,7 +1343,7 @@ if (!empty($moreforfilter)) { } $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields with user setup $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); $selectedfields .= ((count($arrayofmassactions) && $contextpage != 'poslist') ? $form->showCheckAddButtons('checkforselect', 1) : ''); @@ -1354,7 +1354,7 @@ print ''; // Action column -if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { +if ($conf->main_checkbox_left_column) { print ''; } // Action column -if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { +if (!$conf->main_checkbox_left_column) { print ''; // Action column -if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { +if ($conf->main_checkbox_left_column) { print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n"; $totalarray['nbfield']++; } @@ -1855,7 +1855,7 @@ if (!empty($arrayfields['s.import_key']['checked'])) { $totalarray['nbfield']++; // For the column action } // Action column -if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { +if (!$conf->main_checkbox_left_column) { print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n"; $totalarray['nbfield']++; } @@ -1936,7 +1936,7 @@ while ($i < $imaxinloop) { print '>'; // Action column (Show the massaction button only when this page is not opened from the Extended POS) - if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + if ($conf->main_checkbox_left_column) { print '
'; $searchpicto = $form->showFilterButtons('left'); print $searchpicto; @@ -1647,7 +1647,7 @@ if (!empty($arrayfields['s.import_key']['checked'])) { print ''; $searchpicto = $form->showFilterButtons(); print $searchpicto; @@ -1663,7 +1663,7 @@ $totalarray['nbfield'] = 0; // -------------------------------------------------------------------- print '
'; if (($massactionbutton || $massaction) && $contextpage != 'poslist') { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined $selected = 0; @@ -2354,7 +2354,7 @@ while ($i < $imaxinloop) { } } // Action column (Show the massaction button only when this page is not opened from the Extended POS) - if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + if (!$conf->main_checkbox_left_column) { print ''; if (($massactionbutton || $massaction) && $contextpage != 'poslist') { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined $selected = 0;