From 6e874e9c32a0ed9d429249bda719ec16546a6082 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 9 Feb 2006 16:12:34 +0000 Subject: [PATCH] =?UTF-8?q?ajout=20description=20du=20produit=20dans=20la?= =?UTF-8?q?=20fiche=20propal=20si=20constante=20PROP=5FADD=5FPROD=5FDESC?= =?UTF-8?q?=20=20=E0=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/propal.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index ef64c937529..ad8ba97c5b7 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -683,6 +683,12 @@ 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) + { + $sql.= ', p.description as product_desc'; + } + $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid'; $sql.= ' WHERE pt.fk_propal = '.$propal->id; @@ -722,7 +728,12 @@ if ($_GET['propalid'] > 0) if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); else print img_object($langs->trans('ShowProduct'),'product'); print ' '.$objp->ref.''; - print ' - '.nl2br(stripslashes($objp->product)); + print ' - '.nl2br(stripslashes($objp->product)); + + if ($conf->global->PROP_ADD_PROD_DESC) + { + print '
'.$objp->product_desc; + if ($objp->date_start && $objp->date_end) { print ' (Du '.dolibarr_print_date($objp->date_start).' au '.dolibarr_print_date($objp->date_end).')';