From 4993c5e84be439d7165226fc4155e2e1196609dd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 11 Feb 2006 18:23:39 +0000 Subject: [PATCH] modification de la description produit --- htdocs/comm/propal.php | 4 ++-- htdocs/commande/fiche.php | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index f97846cedfa..3d9f54db246 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) + if ($conf->global->PROP_ADD_PROD_DESC && $conf->global->CHANGE_PROD_DESC=0) { $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) + if ($conf->global->PROP_ADD_PROD_DESC && $conf->global->CHANGE_PROD_DESC=0) { print '
'.nl2br(stripslashes($objp->product_desc)); } diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index d78adbc800c..772e36af9ce 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -683,6 +683,12 @@ 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 && $conf->global->CHANGE_PROD_DESC=0) + { + $sql.= ', p.description as product_desc'; + } + $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product=p.rowid'; $sql.= ' WHERE l.fk_commande = '.$commande->id; @@ -724,6 +730,12 @@ else else print img_object($langs->trans('ShowProduct'),'product'); 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 && $conf->global->CHANGE_PROD_DESC=0) + { + print '
'.nl2br(stripslashes($objp->product_desc)); + } + print ''; } else