From a165489237b8dc5da4b8213b247d33365d779e74 Mon Sep 17 00:00:00 2001 From: Anthony Berton Date: Tue, 17 Jan 2023 11:46:39 +0100 Subject: [PATCH 1/2] Move checkbox --- htdocs/commande/list_det.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index fd36f229e5c..385408663fd 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -830,10 +830,6 @@ if ($resql) { print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'order', 0, $newcardbutton, '', $limit, 0, 0, 1); - print ''; - print ''; - print ''; - $topicmail = "SendOrderRef"; $modelmail = "order_send"; $objecttmp = new Commande($db); @@ -849,6 +845,11 @@ if ($resql) { $moreforfilter = ''; + $moreforfilter .= ''; + $moreforfilter .= ''; + $moreforfilter .= ''; + $moreforfilter .= '
'; + // If the user can view prospects other than his' if ($user->rights->user->user->lire) { $langs->load("commercial"); @@ -888,6 +889,8 @@ if ($resql) { $moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle, 0, 0, array(), 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= ''; } + + $parameters = array(); $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook if (empty($reshook)) { From c3a5d32b8dd1c33e26781112723d2506b1452ca0 Mon Sep 17 00:00:00 2001 From: Anthony Berton Date: Tue, 17 Jan 2023 12:07:02 +0100 Subject: [PATCH 2/2] FIX - Filter checkbox memory to reload page --- htdocs/commande/list_det.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 385408663fd..651b8fffe8d 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -793,6 +793,15 @@ if ($resql) { if ($search_fk_input_reason > 0) { $param .= '&search_fk_input_reason='.urlencode($search_fk_input_reason); } + if (!empty($productobuy)) { + $param .= '&productobuy='.urlencode($productobuy); + } + if (!empty($productonly)) { + $param .= '&productonly='.urlencode($productonly); + } + if (!empty($disablelinefree)) { + $param .= '&disablelinefree='.urlencode($disablelinefree); + } // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';