diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php index d937b34536f1a2fb00bc32b19c1e451b12a9a913..0ca4d6f858987df74693bd58d2dfc5069db94c46 100644 --- a/dev/skeletons/skeleton_list.php +++ b/dev/skeletons/skeleton_list.php @@ -89,8 +89,11 @@ if ($user->societe_id > 0) //accessforbidden(); } +// Initialize technical object to manage context to save list fields +$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist'; + // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array -$hookmanager->initHooks(array('skeletonlist')); +$hookmanager->initHooks(array('mymodulelist')); $extrafields = new ExtraFields($db); // fetch optionals attributes and labels @@ -305,6 +308,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value= print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit); diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php index b14d48c174e9073dbbd4226efda2ebef4451416d..5eeca63a4aacf32bddfe8e7d2ec834801e7399c2 100644 --- a/htdocs/comm/action/class/api_agendaevents.class.php +++ b/htdocs/comm/action/class/api_agendaevents.class.php @@ -94,7 +94,7 @@ class AgendaEvents extends DolibarrApi * @param int $limit Limit for list * @param int $page Page number * @param string $user_ids User ids filter field (owners of event). Example: '1' or '1,2,3' {@pattern /^[0-9,]*$/i} - * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')" + * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.date_creation:<:'20160101')" * @return array Array of Agenda Events objects */ function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 0, $page = 0, $user_ids = 0, $sqlfilters = '') { diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 0262187b342147e66e1c56e75ef8e74e72a44088..9ca79421f20bb8a4fce66a99d86139832c876c68 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -99,7 +99,7 @@ if (! $sortfield) $sortfield='c.ref'; if (! $sortorder) $sortorder='DESC'; // Initialize technical object to manage context to save list fields -$contextpage='orderlist'; +$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'orderlist'; // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array($contextpage)); @@ -653,6 +653,7 @@ if ($resql) print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; + print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">'; print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index b95e0c5bd25bbeef1fec6e1ef96b8fe625a62c42..a88e180b16a9fd499c2554184d97f566c3e956e1 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -844,7 +844,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->commande->enabled)) { $langs->load("orders"); - if (! empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-3&billed=0", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders'); + if (! empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-3&billed=0&contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders'); // if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire); }