From bc2436e3141614496bd6cbdb1c2ff0590004730e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 3 May 2011 18:54:59 +0000 Subject: [PATCH] Fix: Add ref and label on service list --- htdocs/contrat/fiche.php | 2 +- htdocs/contrat/services.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 6df95ead831..77488a72e1a 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -757,7 +757,7 @@ else $productstatic->ref=$objp->pref; print $productstatic->getNomUrl(1,'',20); print $objp->label?' - '.dol_trunc($objp->label,16):''; - if ($objp->description) print '
'.nl2br($objp->description); + if ($objp->description) print '
'.dol_nl2br($objp->description); print ''; } else diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index dac554e00c4..a038d475fbf 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -204,6 +204,7 @@ if ($resql) $productstatic->ref=$obj->pref; print $productstatic->getNomUrl(1,'',20); print $obj->label?' - '.dol_trunc($obj->label,16):''; + if ($obj->description && $conf->global->PRODUIT_DESC_IN_LIST) print '
'.dol_nl2br($obj->description); } else {