From f5bdb63768e848fc3412383c76981831ed7e4439 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 11 Feb 2006 18:11:07 +0000 Subject: [PATCH] modification de la description produit --- htdocs/compta/facture.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 50bdb387ef7..29b43ff49c0 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1371,7 +1371,7 @@ else $sql .= ' '.$db->pdate('l.date_end').' as date_end, '; $sql .= ' p.ref, p.fk_product_type, p.label as product'; - if ($conf->global->FAC_ADD_PROD_DESC) + if ($conf->global->FAC_ADD_PROD_DESC && $conf->global->CHANGE_PROD_DESC=0) { $sql.= ', p.description as product_desc'; } @@ -1420,7 +1420,7 @@ else print_date_range($objp->date_start,$objp->date_end); print ($objp->description && $objp->description!=$objp->product)?'
'.$objp->description:''; - if ($conf->global->FAC_ADD_PROD_DESC) + if ($conf->global->FAC_ADD_PROD_DESC && $conf->global->CHANGE_PROD_DESC=0) { print '
'.nl2br(stripslashes($objp->product_desc)); }