diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 6cdd09a4746..e377276ef23 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -104,7 +104,7 @@ else if ($fourn_id > 0) { - $sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = $fourn_id"; + $sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = $fourn_id"; } $sql .= " ORDER BY $sortfield $sortorder "; @@ -114,117 +114,117 @@ $resql = $db->query($sql) ; if ($resql) { $num = $db->num_rows($resql); - + $i = 0; - + if ($num == 1 && (isset($_POST["sall"]) or $snom or $sref)) { - $objp = $db->fetch_object($resql); - Header("Location: fiche.php?id=$objp->rowid"); + $objp = $db->fetch_object($resql); + Header("Location: fiche.php?id=$objp->rowid"); } - + if (isset($_GET["envente"]) || isset($_POST["envente"])) - { - $envente = (isset($_GET["envente"])?$_GET["envente"]:$_POST["envente"]); - } + { + $envente = (isset($_GET["envente"])?$_GET["envente"]:$_POST["envente"]); + } else - { - $envente=1; - } - + { + $envente=1; + } + if (! $envente) - { + { if (isset($_GET["type"]) || isset($_POST["type"])) { - $type=isset($_GET["type"])?$_GET["type"]:$_POST["type"]; - if ($type) { $texte = $langs->trans("ServicesNotOnSell"); } - else { $texte = $langs->trans("ProductsNotOnSell"); } - } else { - $texte = $langs->trans("ProductsAndServicesNotOnSell"); + $type=isset($_GET["type"])?$_GET["type"]:$_POST["type"]; + if ($type) { $texte = $langs->trans("ServicesNotOnSell"); } + else { $texte = $langs->trans("ProductsNotOnSell"); } + } else { + $texte = $langs->trans("ProductsAndServicesNotOnSell"); + } } - } - else - { - if (isset($_POST["type"]) || isset($_GET["type"])) { - if ($type) { $texte = $langs->trans("ServicesOnSell"); } - else { $texte = $langs->trans("ProductsOnSell"); } - } else { - $texte = $langs->trans("ProductsAndServicesOnSell"); + else + { + if (isset($_POST["type"]) || isset($_GET["type"])) { + if ($type) { $texte = $langs->trans("ServicesOnSell"); } + else { $texte = $langs->trans("ProductsOnSell"); } + } else { + $texte = $langs->trans("ProductsAndServicesOnSell"); + } + } + + llxHeader("","",$texte); + + if ($sref || $snom || $_POST["sall"] || $_POST["search"]) + { + print_barre_liste($texte, $page, "liste.php", "&sref=".$sref."&snom=".$snom."&envente=".$_POST["envente"], $sortfield, $sortorder,'',$num); + } + else + { + print_barre_liste($texte, $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); + } + + print ''; + + // Lignes des titres + print ""; + print_liste_field_titre($langs->trans("Ref"),"liste.php", "p.ref","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); + print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); + print_liste_field_titre($langs->trans("DateModification"),"liste.php", "p.tms","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); + print_liste_field_titre($langs->trans("SellingPrice"),"liste.php", "p.price","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield); + print "\n"; + + // Lignes des champs de filtre + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + + $var=True; + while ($i < min($num,$limit)) + { + $objp = $db->fetch_object($resql); + $var=!$var; + print "'; + print ''; + print ''; + print ''; + print "\n"; + $i++; + } + $db->free($resql); + + print "
'; + print ''; + print ''; + print ''; + print ''; + print ' '; + print ''; + print ''; + print ''; + print '
"; + print "rowid\">"; + if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); + else print img_object($langs->trans("ShowProduct"),"product"); + print ' '; + print ''.$objp->ref.''.$objp->label.''.dolibarr_print_date($objp->datem).''.price($objp->price).'
"; + + } + else + { + dolibarr_print_error($db); } - } - - llxHeader("","",$texte); - - if ($sref || $snom || $_POST["sall"] || $_POST["search"]) - { - print_barre_liste($texte, $page, "liste.php", "&sref=".$sref."&snom=".$snom."&envente=".$_POST["envente"], $sortfield, $sortorder,'',$num); - } - else - { - print_barre_liste($texte, $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); - } - - print ''; - - // Lignes des titres - print ""; - print_liste_field_titre($langs->trans("Ref"),"liste.php", "p.ref","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); - print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); - print_liste_field_titre($langs->trans("DateModification"),"liste.php", "p.tms","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); - print_liste_field_titre($langs->trans("SellingPrice"),"liste.php", "p.price","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield); - print "\n"; - - // Lignes des champs de filtre - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - - $var=True; - while ($i < min($num,$limit)) - { - $objp = $db->fetch_object($result); - $var=!$var; - print "'; - print ''; - print ''; - print ''; - print "\n"; - $i++; - } - $db->free($result); - - print "
'; - print ''; - print ''; - print ''; - print ''; - print ' '; - print ''; - print ''; - print ''; - print '
"; - print "rowid\">"; - if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); - else print img_object($langs->trans("ShowProduct"),"product"); - print ' '; - print ''.$objp->ref.''.$objp->label.''.dolibarr_print_date($objp->datem).''.price($objp->price).'
"; - -} -else -{ - dolibarr_print_error($db); -} $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?>