Merge branch '3.1' of git://github.com/Dolibarr/dolibarr.git into 3.1
This commit is contained in:
commit
582d994e54
@ -731,11 +731,11 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
|
||||
{
|
||||
if ($idprod)
|
||||
{
|
||||
if ( empty($hidedesc) ) $libelleproduitservice.=$desc;
|
||||
if ( empty($hidedesc) ) $libelleproduitservice.=dol_htmlentitiesbr($desc,1);
|
||||
}
|
||||
else
|
||||
{
|
||||
$libelleproduitservice.=$desc;
|
||||
$libelleproduitservice.=dol_htmlentitiesbr($desc,1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user