diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index ece0d4399fc..c80b54be482 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -333,7 +333,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index 25a0c0cd521..d397d3c312c 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -382,7 +382,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php index 3641b00afcf..b787fc95605 100644 --- a/htdocs/asset/model/list.php +++ b/htdocs/asset/model/list.php @@ -385,7 +385,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php index 0fbb2c3c466..bf1e2a87269 100644 --- a/htdocs/bom/bom_list.php +++ b/htdocs/bom/bom_list.php @@ -460,7 +460,7 @@ foreach ($search as $key => $val) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php index a193c674a08..dfeba488f91 100644 --- a/htdocs/bookcal/availabilities_list.php +++ b/htdocs/bookcal/availabilities_list.php @@ -436,7 +436,7 @@ foreach ($search as $key => $val) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php index 0dce40a3fdc..691f1d691b3 100644 --- a/htdocs/bookcal/calendar_list.php +++ b/htdocs/bookcal/calendar_list.php @@ -417,7 +417,7 @@ foreach ($search as $key => $val) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index f333df50690..1ec504c2812 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -233,7 +233,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index 652f771cb4e..a1f3df49b18 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -301,7 +301,7 @@ if ($filteremail) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 65a3f95779d..d45aa2881db 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -1052,7 +1052,7 @@ if ($search_date_signature_endyear) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 20f479385db..692ac788286 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -862,7 +862,7 @@ if ($resql) { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks - $parameters = array(); + $parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index 9dcb5a28f4b..64c4d7d5fc6 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -343,7 +343,7 @@ if ($show_files) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php index c3cd5cd37a1..984686af4d6 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_list.php +++ b/htdocs/compta/cashcontrol/cashcontrol_list.php @@ -371,7 +371,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php index 36ab91200db..f1450c93eb2 100644 --- a/htdocs/compta/facture/invoicetemplate_list.php +++ b/htdocs/compta/facture/invoicetemplate_list.php @@ -520,7 +520,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index aca6154587a..2bfee92c755 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -1197,7 +1197,7 @@ if (!empty($search_fac_rec_source_title)) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7803dd4c644..050e890b4f8 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -12697,6 +12697,13 @@ function getElementProperties($elementType) $classfile = 'conferenceorbooth'; $classname = 'ConferenceOrBooth'; $module = 'eventorganization'; + } elseif ($elementType == 'ccountry') { + $module = ''; + $classpath = 'core/class'; + $classfile = 'ccountry'; + $classname = 'Ccountry'; + $table_element = 'c_country'; + $subelement = ''; } if (empty($classfile)) { @@ -12806,7 +12813,6 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '', $us //var_dump('element_type='.$element_type); //var_dump($element_prop); //var_dump($element_prop['module'].' '.$ismodenabled); - if (is_array($element_prop) && (empty($element_prop['module']) || $ismodenabled)) { if ($useCache === 1 && !empty($globalCacheForGetObjectFromCache[$element_type]) diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php index 94a882efc03..038051a9056 100644 --- a/htdocs/eventorganization/conferenceorbooth_list.php +++ b/htdocs/eventorganization/conferenceorbooth_list.php @@ -724,7 +724,7 @@ foreach ($search as $key => $val) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php index 84607507cb7..1492d20e192 100644 --- a/htdocs/eventorganization/conferenceorboothattendee_list.php +++ b/htdocs/eventorganization/conferenceorboothattendee_list.php @@ -716,7 +716,7 @@ $param .= $withProjectUrl; // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index d296611cc53..eac2b349c13 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -595,7 +595,7 @@ if ($optioncss != '') { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index a17cb6f6f14..22fbbb86979 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -483,7 +483,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index ef294173fc3..bee99153ffe 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -1178,7 +1178,7 @@ if ($resql) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; - $parameters = array(); + $parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php index 9dd2ca34e7b..04443200f4d 100644 --- a/htdocs/fourn/facture/list-rec.php +++ b/htdocs/fourn/facture/list-rec.php @@ -515,7 +515,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 19b660916a7..77c104c2148 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -950,7 +950,7 @@ if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php index a8309143ef2..4f1bb1de9f8 100644 --- a/htdocs/hrm/evaluation_list.php +++ b/htdocs/hrm/evaluation_list.php @@ -415,7 +415,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php index eaf7b63be3b..eb710892a92 100644 --- a/htdocs/hrm/job_list.php +++ b/htdocs/hrm/job_list.php @@ -392,7 +392,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php index 6c227add829..8797dd4b772 100644 --- a/htdocs/hrm/position.php +++ b/htdocs/hrm/position.php @@ -468,7 +468,7 @@ if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create' // Add $param from extra fields include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks - $parameters = array(); + $parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php index 48dc29262c5..864c14d5cba 100644 --- a/htdocs/hrm/position_list.php +++ b/htdocs/hrm/position_list.php @@ -404,7 +404,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php index 2f0b87ba89b..8d73bb14783 100644 --- a/htdocs/hrm/skill_list.php +++ b/htdocs/hrm/skill_list.php @@ -402,7 +402,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php index a830e2dfa8e..9c5741ac040 100644 --- a/htdocs/intracommreport/list.php +++ b/htdocs/intracommreport/list.php @@ -351,7 +351,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php index 797eb58052c..ea8042e12f2 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_list.php +++ b/htdocs/knowledgemanagement/knowledgerecord_list.php @@ -423,7 +423,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php index a98cab59988..daeb8147d04 100644 --- a/htdocs/loan/list.php +++ b/htdocs/loan/list.php @@ -251,7 +251,7 @@ if ($search_amount) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 3e30d520e5b..604c4a791c2 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -498,7 +498,7 @@ foreach ($search as $key => $val) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php index c88168ed1b9..6eee39c6613 100644 --- a/htdocs/mrp/mo_list.php +++ b/htdocs/mrp/mo_list.php @@ -400,7 +400,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php index 0b305cf3798..e593df184f3 100644 --- a/htdocs/partnership/partnership_list.php +++ b/htdocs/partnership/partnership_list.php @@ -627,7 +627,7 @@ if ($search_filter && $search_filter != '-1') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php index ad5a43e37d2..6335bf3c68e 100644 --- a/htdocs/product/inventory/list.php +++ b/htdocs/product/inventory/list.php @@ -410,7 +410,7 @@ foreach ($searchCategoryProductList as $searchCategoryProduct) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 4f0f4469f09..124ae2f8399 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -832,7 +832,7 @@ if ($search_finished) { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 8b8a378ec01..d990a428164 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -281,7 +281,7 @@ if ($id > 0 || !empty($ref)) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks - $parameters = array(); + $parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $option .= $hookmanager->resPrint; diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index bd33d5b1b3b..aeb5d965bb6 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -438,7 +438,7 @@ foreach ($search as $key => $val) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index 6603b3aabce..1163e74cd3a 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -1061,7 +1061,7 @@ if ($search_fk_project != '' && $search_fk_project != '-1') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $warehouse, $action); // Note that $action and $warehouse may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index dca00fcfbd9..94217be3ef1 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -397,7 +397,7 @@ if ($optioncss != '') { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php index 727282095b6..b05912c6dea 100644 --- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php +++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php @@ -392,7 +392,7 @@ foreach ($search as $key => $val) { // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 84071529c03..868501c21dc 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -828,6 +828,12 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) { if ($limit > 0 && $limit != $conf->liste_limit) { $param .= '&limit='.((int) $limit); } +if ($optioncss != '') { + $param .= '&optioncss='.urlencode($optioncss); +} +if ($socid) { + $param .= '&socid='.urlencode((string) $socid); +} if ($search_all != '') { $param .= '&search_all='.urlencode($search_all); } @@ -945,9 +951,6 @@ if ($search_date_modif_endday) { if ($search_date_modif_end) { $param .= '&search_date_modif_end=' . urlencode($search_date_modif_end); } -if ($socid) { - $param .= '&socid='.urlencode((string) ($socid)); -} if (!empty($search_category_array)) { foreach ($search_category_array as $tmpval) { $param .= '&search_categegory_project_list[]='.urlencode($tmpval); @@ -1019,9 +1022,6 @@ if ($search_login) { if ($search_import_key) { $param .= '&search_import_key='.urlencode($search_import_key); } -if ($optioncss != '') { - $param .= '&optioncss='.urlencode($optioncss); -} foreach ($searchCategoryCustomerList as $searchCategoryCustomer) { $param .= "&search_category_customer_list[]=".urlencode($searchCategoryCustomer); } @@ -1029,7 +1029,7 @@ foreach ($searchCategoryCustomerList as $searchCategoryCustomer) { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // Add $param from hooks -$parameters = array(); +$parameters = array('param' => &$param); $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $param .= $hookmanager->resPrint; @@ -1231,10 +1231,10 @@ if (!empty($arrayfields['commercial']['checked'])) { if (!empty($arrayfields['p.dateo']['checked'])) { print '