diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index eb89c244518..83ce23cfd67 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -25,7 +25,7 @@ $page = $_GET["page"]; $sortorder = $_GET["sortorder"]; $sortfield = $_GET["sortfield"]; -llxHeader('','Telephonie - Ligne - Liste'); +llxHeader('','Prélèvements'); /* * Sécurité accés client */ @@ -61,7 +61,15 @@ $pagenext = $page + 1; * */ $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 .= " , ".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"; + if ($_GET["search_client"]) { @@ -79,24 +87,27 @@ if ($result) $urladd= "&statut=".$_GET["statut"]; - print_barre_liste("Prélèvements", $page, "liste.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste("Prélèvements", $page, "bons.php", $urladd, $sortfield, $sortorder, '', $num); print"\n\n"; print '
| Facture | "; + print_liste_field_titre("Société","bons.php","s.nom"); + print_liste_field_titre("Date","bons.php","p.datec","","",'align="center"'); print 'Montant | '; print '||||
| "; - print ''; + print ''; print img_file(); print ' '; print ''.$obj->ref." | \n"; + print ''.$obj->facnumber." | \n"; + + print ''.$obj->nom." | \n"; + print ''.strftime("%d/%m/%Y",$obj->datec)." | \n"; - print ''.price($obj->amount)." euros | \n"; + print ''.price($obj->total_ttc)." euros | \n"; print "