diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 220721d6f5e..dead4b4beb4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2395,8 +2395,8 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
// If field is used as sort criteria we use a specific class
// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
- if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="liste_titre_sel" '. $moreattrib.'>';
- else $out.= '<'.$tag.' class="liste_titre" '. $moreattrib.'>';
+ if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="liste_titre_sel'.($field?' nowrap':'').'" '. $moreattrib.'>';
+ else $out.= '<'.$tag.' class="liste_titre'.($field?' nowrap':'').'" '. $moreattrib.'>';
if (! empty($conf->dol_optimize_smallscreen) && empty($thead) && $field) // If this is a sort field
{
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index efe4799bdee..30ed2fd95b1 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -271,6 +271,13 @@ else
// Filter on categories
$moreforfilter='';
+ $colspan=6;
+ if (! empty($conf->barcode->enabled)) $colspan++;
+ if (! empty($conf->service->enabled) && $type != 0) $colspan++;
+ if (empty($conf->global->PRODUIT_MULTIPRICES)) $colspan++;
+ if ($user->rights->fournisseur->lire) $colspan++;
+ if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) $colspan+=2;
+
if (! empty($conf->categorie->enabled))
{
$moreforfilter.=$langs->trans('Categories'). ': ';
@@ -280,22 +287,20 @@ else
if ($moreforfilter)
{
print '
';
- print '| ';
+ print ' | ';
print $moreforfilter;
print ' |
';
}
// Lignes des titres
- print "";
+ print '
';
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
if (! empty($conf->barcode->enabled)) print_liste_field_titre($langs->trans("BarCode"), $_SERVER["PHP_SELF"], "p.barcode",$param,'','',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateModification"), $_SERVER["PHP_SELF"], "p.tms",$param,"",'align="center"',$sortfield,$sortorder);
if (! empty($conf->service->enabled) && $type != 0) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("SellingPrice"), $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder);
- if ($user->rights->produit->creer) {
- print '| '.$langs->trans("BuyingPriceMinShort").' | ';
- }
+ if ($user->rights->fournisseur->lire) print ''.$langs->trans("BuyingPriceMinShort").' | ';
if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print ''.$langs->trans("DesiredStock").' | ';
if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print ''.$langs->trans("PhysicalStock").' | ';
print_liste_field_titre($langs->trans("Sell"), $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder);
@@ -338,7 +343,7 @@ else
}
// Minimum buying Price
- if ($user->rights->produit->creer) {
+ if ($user->rights->fournisseur->lire) {
print '';
print ' ';
print ' | ';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ea44564b8d5..19b2cb5bd84 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1750,7 +1750,6 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list
color: #;
font-family: ;
border-bottom: 1px solid #FDFFFF;
- white-space: ;
text-align: ;
}
tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre
@@ -1758,7 +1757,6 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
font-family: ;
font-weight: bold;
border-bottom: 1px solid #FDFFFF;
- white-space: ;
text-shadow: 1px 0px 1px #;
vertical-align: middle;
}
@@ -1774,7 +1772,6 @@ tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre
font-family: ;
font-weight: normal;
border-bottom: 1px solid #FDFFFF;
- white-space: ;
text-decoration: underline;
text-shadow: 1px 0px 1px #;
}