This commit is contained in:
Laurent Destailleur 2017-08-24 13:35:52 +02:00
parent 326d3df63f
commit 2416c387f5

View File

@ -591,28 +591,28 @@ if ($search_all)
// Filter on categories // Filter on categories
$moreforfilter=''; $moreforfilter='';
//if ($type == 'c' || $type == 'p') if (empty($type) || $type == 'c' || $type == 'p')
//{ {
if (! empty($conf->categorie->enabled)) if (! empty($conf->categorie->enabled))
{ {
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$moreforfilter.='<div class="divsearchfield">'; $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('Categories'). ' ('.$langs->trans("Customer").'): '; $moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
$moreforfilter.=$formother->select_categories('customer',$search_categ_cus,'search_categ_cus',1); $moreforfilter.=$formother->select_categories('customer',$search_categ_cus,'search_categ_cus',1);
$moreforfilter.='</div>'; $moreforfilter.='</div>';
} }
//} }
//if ($type == 'f') if (empty($type) || $type == 'f')
//{ {
if (! empty($conf->categorie->enabled)) if (! empty($conf->categorie->enabled))
{ {
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$moreforfilter.='<div class="divsearchfield">'; $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('Categories'). ' ('.$langs->trans("Supplier").'): '; $moreforfilter.=$langs->trans('SuppliersCategoriesShort').': ';
$moreforfilter.=$formother->select_categories('supplier',$search_categ_sup,'search_categ_sup',1); $moreforfilter.=$formother->select_categories('supplier',$search_categ_sup,'search_categ_sup',1);
$moreforfilter.='</div>'; $moreforfilter.='</div>';
} }
//} }
// If the user can view prospects other than his' // If the user can view prospects other than his'
if ($user->rights->societe->client->voir || $socid) if ($user->rights->societe->client->voir || $socid)