modification de la description produit

This commit is contained in:
Regis Houssin 2006-02-11 19:11:54 +00:00
parent c6b59aaa72
commit e1ae512203
2 changed files with 4 additions and 4 deletions

View File

@ -686,7 +686,7 @@ else
$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 && !$conf->global->CHANGE_PROD_DESC)
{
$sql.= ', p.description as product_desc';
}
@ -734,7 +734,7 @@ else
print ($objp->description && $objp->description!=$objp->product)?'<br>'.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=0)
{
print '<br>'.nl2br(stripslashes($objp->product_desc));
}

View File

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