diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 3890155f116..4535c0514e9 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -704,25 +704,29 @@ $moreforfilter = '';
if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$moreforfilter .= '
';
- $moreforfilter .= $langs->trans('Categories').': ';
- $moreforfilter .= $formother->select_categories(Categorie::TYPE_CONTACT, $search_categ, 'search_categ', 1);
+ $tmptitle = $langs->trans('ContactCategoriesShort');
+ $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
+ $moreforfilter .= $formother->select_categories(Categorie::TYPE_CONTACT, $search_categ, 'search_categ', 1, $tmptitle);
$moreforfilter .= '
';
if (empty($type) || $type == 'c' || $type == 'p') {
$moreforfilter .= '';
+ $tmptitle = '';
if ($type == 'c') {
- $moreforfilter .= $langs->trans('CustomersCategoriesShort').': ';
+ $tmptitle .= $langs->trans('CustomersCategoriesShort');
} elseif ($type == 'p') {
- $moreforfilter .= $langs->trans('ProspectsCategoriesShort').': ';
+ $tmptitle .= $langs->trans('ProspectsCategoriesShort');
} else {
- $moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
+ $tmptitle .= $langs->trans('CustomersProspectsCategoriesShort');
}
- $moreforfilter .= $formother->select_categories(Categorie::TYPE_CUSTOMER, $search_categ_thirdparty, 'search_categ_thirdparty', 1);
+ $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
+ $moreforfilter .= $formother->select_categories(Categorie::TYPE_CUSTOMER, $search_categ_thirdparty, 'search_categ_thirdparty', 1, $tmptitle);
$moreforfilter .= '
';
}
if (empty($type) || $type == 'f') {
$moreforfilter .= '';
- $moreforfilter .= $langs->trans('SuppliersCategoriesShort').': ';
- $moreforfilter .= $formother->select_categories(Categorie::TYPE_SUPPLIER, $search_categ_supplier, 'search_categ_supplier', 1);
+ $tmptitle = $langs->trans('SuppliersCategoriesShort');
+ $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
+ $moreforfilter .= $formother->select_categories(Categorie::TYPE_SUPPLIER, $search_categ_supplier, 'search_categ_supplier', 1, $tmptitle);
$moreforfilter .= '
';
}
}
@@ -1092,35 +1096,35 @@ while ($i < min($num, $limit)) {
}
// Phone
if (!empty($arrayfields['p.phone']['checked'])) {
- print ''.dol_print_phone($obj->phone_pro, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').' | ';
+ print ''.dol_print_phone($obj->phone_pro, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').' | ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Phone perso
if (!empty($arrayfields['p.phone_perso']['checked'])) {
- print ''.dol_print_phone($obj->phone_perso, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').' | ';
+ print ''.dol_print_phone($obj->phone_perso, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').' | ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Phone mobile
if (!empty($arrayfields['p.phone_mobile']['checked'])) {
- print ''.dol_print_phone($obj->phone_mobile, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'mobile').' | ';
+ print ''.dol_print_phone($obj->phone_mobile, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'mobile').' | ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Fax
if (!empty($arrayfields['p.fax']['checked'])) {
- print ''.dol_print_phone($obj->fax, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'fax').' | ';
+ print ''.dol_print_phone($obj->fax, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'fax').' | ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// EMail
if (!empty($arrayfields['p.email']['checked'])) {
- print ''.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).' | ';
+ print ''.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).' | ';
if (!$i) {
$totalarray['nbfield']++;
}
@@ -1144,7 +1148,7 @@ while ($i < min($num, $limit)) {
}
// Company
if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom']['checked'])) {
- print '';
+ print ' | ';
if ($obj->socid) {
$objsoc = new Societe($db);
$objsoc->fetch($obj->socid);
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 47ef99490cb..74a04f34858 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -941,7 +941,8 @@ if (empty($type) || $type == 'c' || $type == 'p') {
if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$moreforfilter .= ' ';
- $moreforfilter .= img_picto('', 'category', 'class="pictofixedwidth"');
+ $tmptitle = $langs->trans('Categories');
+ $moreforfilter .= img_picto($tmptile, 'category', 'class="pictofixedwidth"');
$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
$moreforfilter .= ' ';
}
@@ -950,7 +951,8 @@ if (empty($type) || $type == 'f') {
if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$moreforfilter .= '';
- $moreforfilter .= img_picto('', 'category', 'class="pictofixedwidth"');
+ $tmptitle = $langs->trans('Categories');
+ $moreforfilter .= img_picto($tmptilte, 'category', 'class="pictofixedwidth"');
$moreforfilter .= $formother->select_categories('supplier', $search_categ_sup, 'search_categ_sup', 1, $langs->trans('SuppliersCategoriesShort'));
$moreforfilter .= ' ';
}
@@ -959,7 +961,8 @@ if (empty($type) || $type == 'f') {
// If the user can view prospects other than his'
if ($user->rights->societe->client->voir || $socid) {
$moreforfilter .= '';
- $moreforfilter .= img_picto('', 'user', 'class="pictofixedwidth"');
+ $tmptile = $langs->trans('SalesRepresentatives');
+ $moreforfilter .= img_picto($tmptile, 'user', 'class="pictofixedwidth"');
$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $langs->trans('SalesRepresentatives'), ($conf->dol_optimize_smallscreen ? 'maxwidth200' : 'maxwidth300'), 1);
$moreforfilter .= ' ';
}
|