diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index fc5c77c7f3b..64834e08db1 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -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)?'
'.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 '
'.nl2br(stripslashes($objp->product_desc)); } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 29b43ff49c0..8af6fdacc9e 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -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)?'
'.$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 '
'.nl2br(stripslashes($objp->product_desc)); }