diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php index 0819b4fa6c284251923a89abb051f42ff2cbc7b9..999a24ec782be146ee958797798d5a239d1fedf8 100644 --- a/htdocs/core/search_page.php +++ b/htdocs/core/search_page.php @@ -61,8 +61,12 @@ print '<div>'; $nbofsearch=0; +// Instantiate hooks of thirdparty module +$hookmanager->initHooks(array('searchform')); + // Define $searchform -if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire) +// TODO Mutualize code here with function left_menu into main.inc.php page +if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire) { $langs->load("companies"); $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname'); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 48231e64bbc2d9f146583f8162bdd59cfb3aef9a..7a5cd2edcc7092e0fb77c2fdd7adad6c6a84014d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1479,18 +1479,18 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me $searchform=''; $bookmarks=''; - // Instantiate hooks of thirdparty module - $hookmanager->initHooks(array('searchform','leftblock')); - if (empty($conf->dol_hide_leftmenu)) { - if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n"; + // Instantiate hooks of thirdparty module + $hookmanager->initHooks(array('searchform','leftblock')); + + if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n"; else print '<div id="id-left">'; print "\n"; // Define $searchform - if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire) + if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire) { $langs->load("companies"); $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname');