diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index f01d5b106be..d53a8558e38 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -32,54 +32,36 @@ if ($user->societe_id > 0) } /* - * Recherche + * * * */ $page = $_GET["page"]; -$sortorder = $_GET["sortorder"]; -$sortfield = $_GET["sortfield"]; -if ($sortorder == "") $sortorder="DESC"; -if ($sortfield == "") $sortfield="p.datec"; +$sortorder = (empty($_GET["sortorder"])) ? "DESC" : $_GET["sortorder"]; +$sortfield = (empty($_GET["sortfield"])) ? "p.datec" : $_GET["sortfield"]; $offset = $conf->liste_limit * $page ; -$pageprev = $page - 1; -$pagenext = $page + 1; -/* - * Mode Liste - * - * - * - */ -$sql = "SELECT p.rowid, p.ref, p.amount,".$db->pdate("p.datec")." as datec"; -$sql .= " , f.facnumber, f.total_ttc"; -$sql .= " , s.nom"; -$sql .= " FROM ".MAIN_DB_PREFIX."prelevement as p"; -$sql .= " , ".MAIN_DB_PREFIX."facture as f"; -$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf"; +$sql = "SELECT p.rowid, p.statut, p.ref, pl.amount,".$db->pdate("p.datec")." as datec"; +$sql .= " , s.nom, s.code_client"; +$sql .= " , pl.rowid as rowid_ligne, pl.statut as statut_ligne"; +$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; +$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql .= " , ".MAIN_DB_PREFIX."societe as s"; -$sql .= " WHERE s.idp = f.fk_soc"; -$sql .= " AND pf.fk_facture = f.rowid AND pf.fk_prelevement = p.rowid"; +$sql .= " WHERE pl.fk_prelevement_bons = p.rowid"; +$sql .= " AND s.idp = pl.fk_soc"; if ($_GET["search_bon"]) { $sql .= " AND p.ref LIKE '%".$_GET["search_bon"]."%'"; } - if ($_GET["search_societe"]) { $sel =urldecode($_GET["search_societe"]); $sql .= " AND s.nom LIKE '%".$sel."%'"; } -if ($_GET["search_facture"]) -{ - $sql .= " AND f.facnumber LIKE '%".$_GET["search_facture"]."%'"; -} - - $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset); $result = $db->query($sql); @@ -91,31 +73,29 @@ if ($result) $urladd = "&statut=".$_GET["statut"]; $urladd .= "&search_bon=".$_GET["search_bon"]; - print_barre_liste("Prélèvements", $page, "liste.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste("Lignes de prélèvements", $page, "liste.php", $urladd, $sortfield, $sortorder, '', $num); print"\n\n"; print '
| Ligne | '; print_liste_field_titre("Bon","liste.php","p.ref"); - print "Facture | "; + print_liste_field_titre("Société","liste.php","s.nom"); print_liste_field_titre("Date","liste.php","p.datec","","",'align="center"'); print 'Montant | '; + print_liste_field_titre("Code client","liste.php","s.code_client",'','','align="center"'); print '||||||
";
- print '';
- print img_file();
- print ' ';
+ print ' ';
+ print '';
+ print substr('000000'.$obj->rowid_ligne, -6);
+ print ' | ';
+
+ print ' ';
print ''.$obj->ref." | \n";
-
- print ''.$obj->facnumber." | \n"; - - print ''.$obj->nom." | \n"; - + print ''.stripslashes($obj->nom)." | \n"; print ''.strftime("%d/%m/%Y",$obj->datec)." | \n"; - print ''.price($obj->total_ttc)." euros | \n"; - + print ''.price($obj->amount)." euros | \n"; + print ''.$obj->code_client." | \n"; print "