From c6b59aaa72ff8efa441bbc9449f5a592a33155e6 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 11 Feb 2006 19:09:12 +0000 Subject: [PATCH] modification de la description produit --- htdocs/commande/fiche.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 1a85f819e80..fc5c77c7f3b 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -685,8 +685,8 @@ else $sql = 'SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice,'; $sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid'; - if ($conf->global->COM_ADD_PROD_DESC) - //if ($conf->global->COM_ADD_PROD_DESC && $conf->global->CHANGE_PROD_DESC=0) + //if ($conf->global->COM_ADD_PROD_DESC) + if ($conf->global->COM_ADD_PROD_DESC && ($conf->global->CHANGE_PROD_DESC=0)) { $sql.= ', p.description as product_desc'; } @@ -733,8 +733,8 @@ else print ' '.$objp->ref.' - '.stripslashes(nl2br($objp->product)); print ($objp->description && $objp->description!=$objp->product)?'
'.stripslashes(nl2br($objp->description)):''; - if ($conf->global->COM_ADD_PROD_DESC) - //if ($conf->global->COM_ADD_PROD_DESC && $conf->global->CHANGE_PROD_DESC=0) + //if ($conf->global->COM_ADD_PROD_DESC) + if ($conf->global->COM_ADD_PROD_DESC && ($conf->global->CHANGE_PROD_DESC=0)) { print '
'.nl2br(stripslashes($objp->product_desc)); }