From b8f602008892678d52094345fec22b43daf6995b Mon Sep 17 00:00:00 2001 From: BB2A Anthony Berton Date: Fri, 15 Apr 2022 10:35:36 +0200 Subject: [PATCH 1/4] Move checkbox column as first column on Thirdparty list --- htdocs/core/class/html.form.class.php | 17 ++++++++---- htdocs/societe/list.php | 38 ++++++++++++++------------- htdocs/theme/eldy/global.inc.php | 3 +++ 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index b9812d8eec3..679d3b388c6 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -8213,10 +8213,11 @@ class Form * @param string $htmlname Name of HTML field * @param array $array Array with array of fields we could show. This array may be modified according to setup of user. * @param string $varpage Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage); + * @param string $pos position colon on liste value left or right * @return string HTML multiselect string * @see selectarray() */ - public static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage) + public static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage, $pos = '') { global $conf, $langs, $user, $extrafields; @@ -8283,7 +8284,7 @@ class Form
-
    +
      '.$listoffieldsforselection.'
@@ -9375,13 +9376,19 @@ class Form /** * Return HTML to show the search and clear seach button * + * @param string $pos position colon on liste value left or right * @return string */ - public function showFilterButtons() + public function showFilterButtons($pos = '') { $out = '
'; - $out .= ''; - $out .= ''; + if ($pos == 'left') { + $out .= ''; + $out .= ''; + } else { + $out .= ''; + $out .= ''; + } $out .= '
'; return $out; diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index c1165641b03..35a42f0755f 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -998,7 +998,8 @@ if ($moreforfilter) { } $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, 'left'); // This also change content of $arrayfields // Show the massaction checkboxes only when this page is not opend from the Extended POS if ($massactionbutton && $contextpage != 'poslist') { $selectedfields .= $form->showCheckAddButtons('checkforselect', 1); @@ -1013,6 +1014,11 @@ print ''; +// Action column +print ''; if (!empty($arrayfields['s.rowid']['checked'])) { print ''; } -// Action column -print ''; print "\n"; print ''; +print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn '); if (!empty($arrayfields['s.rowid']['checked'])) { print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"], "s.rowid", "", $param, ' data-key="id"', $sortfield, $sortorder, 'actioncolumn '); } @@ -1363,7 +1365,6 @@ if (!empty($arrayfields['s.status']['checked'])) { if (!empty($arrayfields['s.import_key']['checked'])) { print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, '', $sortfield, $sortorder, 'center '); } -print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn '); print "\n"; @@ -1399,6 +1400,18 @@ while ($i < min($num, $limit)) { print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.urlencode($place).'\'"'; } print '>'; + + // Action column (Show the massaction button only when this page is not opend from the Extended POS) + print ''; + if (!empty($arrayfields['s.rowid']['checked'])) { print ''; if (!$i) { $totalarray['nbfield']++; } diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 9a940d9e1a9..1b0f73f787f 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -6451,6 +6451,9 @@ dl.dropdown { overflow: auto; border-radius: 2px; } +.dropdown dd ul.selectedfieldsleft { + right: auto; +} .dropdown dd ul li { white-space: nowrap; font-weight: normal; From 0a31be221771fc5c7acfa896dc84a837b596832b Mon Sep 17 00:00:00 2001 From: BB2A Anthony Berton Date: Fri, 15 Apr 2022 11:05:46 +0200 Subject: [PATCH 2/4] MD Style --- htdocs/societe/list.php | 2 +- htdocs/theme/md/style.css.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 35a42f0755f..b57d5cc0505 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -12,6 +12,7 @@ * Copyright (C) 2018 Nicolas ZABOURI * Copyright (C) 2020 Open-Dsi * Copyright (C) 2021 Frédéric France + * Copyright (C) 2022 Anthony Berton * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -998,7 +999,6 @@ if ($moreforfilter) { } $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; - $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, 'left'); // This also change content of $arrayfields // Show the massaction checkboxes only when this page is not opend from the Extended POS if ($massactionbutton && $contextpage != 'poslist') { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 5ebeb73261e..4fae2e68a56 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -6330,6 +6330,9 @@ dl.dropdown { max-height: 264px; overflow: auto; } +.dropdown dd ul.selectedfieldsleft { + right: auto; +} .dropdown dd ul li { white-space: nowrap; font-weight: normal; From b816e67661dba212806037917b7d5dd632a1d2a5 Mon Sep 17 00:00:00 2001 From: BB2A Anthony Berton Date: Fri, 15 Apr 2022 15:13:52 +0200 Subject: [PATCH 3/4] ADD option MAIN_CHECKBOX_LEFT_COLUMN --- htdocs/societe/list.php | 63 ++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index b57d5cc0505..dad9bbf2921 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -999,8 +999,12 @@ if ($moreforfilter) { } $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; -$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, 'left'); // This also change content of $arrayfields -// Show the massaction checkboxes only when this page is not opend from the Extended POS +if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) { + $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields +} else { + $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, 'left'); // This also change content of $arrayfields +} + // Show the massaction checkboxes only when this page is not opend from the Extended POS if ($massactionbutton && $contextpage != 'poslist') { $selectedfields .= $form->showCheckAddButtons('checkforselect', 1); } @@ -1014,11 +1018,13 @@ print '
'; +$searchpicto = $form->showFilterButtons('left'); +print $searchpicto; +print ''; print ''; @@ -1241,14 +1247,10 @@ if (!empty($arrayfields['s.import_key']['checked'])) { print ''; print ''; -$searchpicto = $form->showFilterButtons(); -print $searchpicto; -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; + if (in_array($obj->rowid, $arrayofselected)) { + $selected = 1; + } + print ''; + } + print ''; print $obj->rowid; @@ -1707,17 +1720,6 @@ while ($i < min($num, $limit)) { $totalarray['nbfield']++; } } - - // Action column (Show the massaction button only when this page is not opend from the Extended POS) - 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; - if (in_array($obj->rowid, $arrayofselected)) { - $selected = 1; - } - print ''; - } - print '
'; -// Action column -print ''; +if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) { + // Action column + print ''; +} if (!empty($arrayfields['s.rowid']['checked'])) { print ''; } +if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) { + // Action column + print ''; +} print "\n"; print ''; -print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn '); +if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) { + print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn '); +} if (!empty($arrayfields['s.rowid']['checked'])) { print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"], "s.rowid", "", $param, ' data-key="id"', $sortfield, $sortorder, 'actioncolumn '); } @@ -1365,6 +1380,9 @@ if (!empty($arrayfields['s.status']['checked'])) { if (!empty($arrayfields['s.import_key']['checked'])) { print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, '', $sortfield, $sortorder, 'center '); } +if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) { + print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn '); +} print "\n"; @@ -1402,16 +1420,17 @@ while ($i < min($num, $limit)) { print '>'; // Action column (Show the massaction button only when this page is not opend from the Extended POS) - print ''; } - print ''; - if (!empty($arrayfields['s.rowid']['checked'])) { print ''; + } if (!$i) { $totalarray['nbfield']++; } From 6f8eef9550fd9c886b7f8229cd98f29ef62e19d0 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 10 May 2022 12:56:22 +0200 Subject: [PATCH 4/4] FIX missing executeHooks --- htdocs/install/upgrade2.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index cda8fc0bc13..f7a97c8af82 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -173,7 +173,12 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ // Create the global $hookmanager object include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager = new HookManager($db); - $reshook = $hookmanager->initHooks(array('doUpgradeBefore')); + $hookmanager->initHooks(array('upgrade2')); + + $parameters = array('versionfrom' => $versionfrom, 'versionto' => $versionto); + $object = new stdClass(); + $action = "upgrade"; + $reshook = $hookmanager->executeHooks('doUpgradeBefore', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks if ($reshook >= 0 && is_array($hookmanager->resArray)) { // Example: $hookmanager->resArray = array(2, 3, 10); $listofentities = array_unique(array_merge($listofentities, $hookmanager->resArray));
'; -$searchpicto = $form->showFilterButtons('left'); -print $searchpicto; -print ''; + $searchpicto = $form->showFilterButtons('left'); + print $searchpicto; + print ''; print ''; @@ -1247,10 +1253,19 @@ if (!empty($arrayfields['s.import_key']['checked'])) { print ''; print ''; + $searchpicto = $form->showFilterButtons(); + print $searchpicto; + 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; - if (in_array($obj->rowid, $arrayofselected)) { - $selected = 1; + if (!empty($conf->global->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; + if (in_array($obj->rowid, $arrayofselected)) { + $selected = 1; + } + print ''; } - print ''; + print ''; print $obj->rowid; @@ -1720,6 +1739,18 @@ while ($i < min($num, $limit)) { $totalarray['nbfield']++; } } + // Action column (Show the massaction button only when this page is not opend from the Extended POS) + if (empty($conf->global->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; + if (in_array($obj->rowid, $arrayofselected)) { + $selected = 1; + } + print ''; + } + print '