diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php index 176eb0e6bb7..565ec787061 100644 --- a/htdocs/fourn/product/liste.php +++ b/htdocs/fourn/product/liste.php @@ -52,8 +52,10 @@ $offset = $limit * $page ; if (! $sortfield) $sortfield="p.ref"; if (! $sortorder) $sortorder="DESC"; -if ($_POST["button_removefilter"] == $langs->trans("RemoveFilter")) { +if (! empty($_POST["button_removefilter"])) +{ $sref=""; + $sRefSupplier=""; $snom=""; } @@ -87,7 +89,7 @@ if ($fourn_id) $sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type,"; $sql .= " pf.fk_soc, pf.ref_fourn,"; -$sql .= " ppf.price as price, ppf.quantity as qty,"; +$sql .= " ppf.price as price, ppf.quantity as qty, ppf.unitprice,"; $sql .= " s.rowid as socid, s.nom"; $sql .= " FROM ".MAIN_DB_PREFIX."product as p"; if ($catid) @@ -182,6 +184,7 @@ if ($resql) print_liste_field_titre($langs->trans("Supplier"),"liste.php", "pf.fk_soc",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("BuyingPrice"),"liste.php", "ppf.price",$param,"",'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("QtyMin"),"liste.php", "ppf.qty",$param,"",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("UnitPrice"),"liste.php", "ppf.unitprice",$param,"",'align="right"',$sortfield,$sortorder); print "\n"; // Lignes des champs de filtre @@ -200,9 +203,9 @@ if ($resql) print ''; print ''; print ''; - print ''; - print ''; - print '  '; + print ''; + print ''; + print '  '; print ''; print ''; print ''; @@ -234,6 +237,8 @@ if ($resql) print ''.$objp->qty.''; + print ''.price($objp->unitprice).''; + print "\n"; $i++; }