modification de la description produit

This commit is contained in:
Regis Houssin 2006-02-11 18:11:07 +00:00
parent dce5a20172
commit f5bdb63768

View File

@ -1371,7 +1371,7 @@ else
$sql .= ' '.$db->pdate('l.date_end').' as date_end, '; $sql .= ' '.$db->pdate('l.date_end').' as date_end, ';
$sql .= ' p.ref, p.fk_product_type, p.label as product'; $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'; $sql.= ', p.description as product_desc';
} }
@ -1420,7 +1420,7 @@ else
print_date_range($objp->date_start,$objp->date_end); print_date_range($objp->date_start,$objp->date_end);
print ($objp->description && $objp->description!=$objp->product)?'<br>'.$objp->description:''; print ($objp->description && $objp->description!=$objp->product)?'<br>'.$objp->description:'';
if ($conf->global->FAC_ADD_PROD_DESC) if ($conf->global->FAC_ADD_PROD_DESC && $conf->global->CHANGE_PROD_DESC=0)
{ {
print '<br>'.nl2br(stripslashes($objp->product_desc)); print '<br>'.nl2br(stripslashes($objp->product_desc));
} }