From c68ab7672af230dc271b111979a6c77c7e179111 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 11 Feb 2006 19:14:36 +0000 Subject: [PATCH] modification de la description produit --- htdocs/comm/propal.php | 4 ++-- htdocs/commande/fiche.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 3d9f54db246..de8b8b04b15 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -684,7 +684,7 @@ if ($_GET['propalid'] > 0) $sql = 'SELECT pt.rowid, pt.description, pt.price, pt.fk_product, pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice,'; $sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid'; - if ($conf->global->PROP_ADD_PROD_DESC && $conf->global->CHANGE_PROD_DESC=0) + if ($conf->global->PROP_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC) { $sql.= ', p.description as product_desc'; } @@ -730,7 +730,7 @@ if ($_GET['propalid'] > 0) print ' '.$objp->ref.''; print ' - '.nl2br(stripslashes($objp->product)); - if ($conf->global->PROP_ADD_PROD_DESC && $conf->global->CHANGE_PROD_DESC=0) + if ($conf->global->PROP_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC) { print '
'.nl2br(stripslashes($objp->product_desc)); } diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 64834e08db1..c01417cfeec 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -733,8 +733,7 @@ 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 && !$conf->global->CHANGE_PROD_DESC) { print '
'.nl2br(stripslashes($objp->product_desc)); }