diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 8e74648500b..71f86cf0fe5 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -298,22 +298,22 @@ if ($object->id > 0) $langs->load("products"); print '
| '.$langs->trans("ProductsAndServices").' | '; + print ' | '.$langs->trans("ProductsAndServices").' | '; print ''.$langs->trans("All").' '.$object->nbOfProductRefs().''; print ' | '; - print $productstatic->ref; + print $objp->supplier_ref; print ' | '; - print ''; + print ' | '; print dol_trunc(dol_htmlentities($objp->label), 30); print ' | '; - print ''.dol_print_date($objp->tms).' | '; + //print ''.dol_print_date($objp->tms, 'day').' | '; + print ''; + //print (isset($objp->unitprice) ? price($objp->unitprice) : ''); + if (isset($objp->price)) + { + print price($objp->price); + if ($objp->quantity > 1) + { + print ' / '; + print $objp->quantity; + } + } + print ' | '; print ''; } } diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 6a4f2255f6b..95ff1620691 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -23,7 +23,7 @@ /** * \file htdocs/fourn/product/list.php * \ingroup produit - * \brief Page liste des produits ou services + * \brief Page to list supplier products and services */ require '../../main.inc.php';