lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modification de la description produit

Browse Source
This commit is contained in:
Regis Houssin 2006-02-12 12:58:34 +00:00
parent aa7b984376
commit b5380eadf3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/comm/propal.php
View File

@ -732,7 +732,6 @@ if ($_GET['propalid'] > 0)
else print img_object($langs->trans('ShowProduct'),'product'); else print img_object($langs->trans('ShowProduct'),'product');
print ' '.$objp->ref.'</a>'; print ' '.$objp->ref.'</a>';
print ' - '.nl2br(stripslashes($objp->product)); print ' - '.nl2br(stripslashes($objp->product));
print ($objp->description && $objp->description!=$objp->product)?'<br>'.stripslashes(nl2br($objp->description)):'';
if ($conf->global->PROP_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC) if ($conf->global->PROP_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC)
{ {
@ -751,7 +750,7 @@ if ($_GET['propalid'] > 0)
{ {
print " (Jusqu'au ".dolibarr_print_date($objp->date_end).')'; print " (Jusqu'au ".dolibarr_print_date($objp->date_end).')';
} }
print ($objp->description && $objp->description!=$objp->product)?'<br>'.$objp->description:''; print ($objp->description && $objp->description!=$objp->product)?'<br>'.stripslashes(nl2br($objp->description)):'';
print '</td>'; print '</td>';
} }
else else

1
htdocs/commande/fiche.php
View File

@ -685,7 +685,6 @@ else
$sql = 'SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice,'; $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'; $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) if ($conf->global->COM_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC)
{ {
$sql.= ', p.description as product_desc'; $sql.= ', p.description as product_desc';