diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 6ab61837f9a..eb5ad4f5715 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -44,11 +44,9 @@ if ($user->societe_id > 0) $socid = $user->societe_id; } - /* * Affichage */ - llxHeader('',$langs->trans("ListPayment")); $page=$_GET["page"]; @@ -71,13 +69,13 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid"; if ($socid) { - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid"; } $sql.= " WHERE p.fk_paiement = c.id"; if ($socid) { - $sql.= " AND f.fk_soc = ".$socid; + $sql.= " AND f.fk_soc = ".$socid; } if ($_GET["search_montant"]) { @@ -86,16 +84,16 @@ if ($_GET["search_montant"]) if ($_GET["orphelins"]) // Option qui ne sert qu'au debogage { - // Paiements liés à aucune facture (pour aide au diagnostic) - $sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount,"; - $sql.= " p.statut, p.num_paiement,"; - //$sql.= " c.libelle as paiement_type"; - $sql.= " c.code as paiement_code"; - $sql.= " FROM ".MAIN_DB_PREFIX."paiement as p,"; - $sql.= " ".MAIN_DB_PREFIX."c_paiement as c"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf"; - $sql.= " ON p.rowid = pf.fk_paiement"; - $sql.= " WHERE p.fk_paiement = c.id AND pf.rowid IS NULL"; + // Paiements liés à aucune facture (pour aide au diagnostic) + $sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount,"; + $sql.= " p.statut, p.num_paiement,"; + //$sql.= " c.libelle as paiement_type"; + $sql.= " c.code as paiement_code"; + $sql.= " FROM ".MAIN_DB_PREFIX."paiement as p,"; + $sql.= " ".MAIN_DB_PREFIX."c_paiement as c"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf"; + $sql.= " ON p.rowid = pf.fk_paiement"; + $sql.= " WHERE p.fk_paiement = c.id AND pf.rowid IS NULL"; } $sql .= " ORDER BY $sortfield $sortorder"; $sql .= $db->plimit( $limit+1 ,$offset); @@ -105,70 +103,67 @@ $resql = $db->query($sql); if ($resql) { - $num = $db->num_rows($resql); - $i = 0; + $num = $db->num_rows($resql); + $i = 0; - $paramlist=($_GET["orphelins"]?"&orphelins=1":""); - print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num); - - print ''; - print ''; - print_liste_field_titre($langs->trans("Ref"),"liste.php","p.rowid","",$paramlist,"",$sortfield); - print_liste_field_titre($langs->trans("Date"),"liste.php","dp","",$paramlist,'align="center"',$sortfield); - print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","",$paramlist,"",$sortfield); - print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$paramlist,"",$sortfield); - print_liste_field_titre($langs->trans("Amount"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield); - print_liste_field_titre($langs->trans("Status"),"liste.php","p.statut","",$paramlist,'align="center"',$sortfield); - print "\n"; - - - // Lignes des champs de filtre - print ''; - print ''; - print ''; - - print ''; - print "\n"; - print ''; - - $var=true; - while ($i < min($num,$limit)) + $paramlist=($_GET["orphelins"]?"&orphelins=1":""); + print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num); + + print ''; + print '
 '; - print ''; - - print ''; - print ''; - print '
'; + print ''; + print_liste_field_titre($langs->trans("Ref"),"liste.php","p.rowid","",$paramlist,"",$sortfield); + print_liste_field_titre($langs->trans("Date"),"liste.php","dp","",$paramlist,'align="center"',$sortfield); + print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","",$paramlist,"",$sortfield); + print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$paramlist,"",$sortfield); + print_liste_field_titre($langs->trans("Amount"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield); + print_liste_field_titre($langs->trans("Status"),"liste.php","p.statut","",$paramlist,'align="center"',$sortfield); + print "\n"; + + // Lignes des champs de filtre + + print ''; + print ''; + print ''; + print "\n"; + + $var=true; + while ($i < min($num,$limit)) { - $objp = $db->fetch_object($resql); - $var=!$var; - print ""; - print ''; - - print ''; - //print ''; - print ''; - print ''; - print ''; - print '"; + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; - $i++; + + print ''; + $i++; } - print "
 '; + print ''; + print ''; + print ''; + print '
'.img_object($langs->trans("ShowPayment"),"payment").''; - - print ' '.$objp->rowid.''.dolibarr_print_date($objp->dp).''.$objp->paiement_type.' '.$objp->num_paiement.''.$langs->trans("PaymentTypeShort".$objp->paiement_code).' '.$objp->num_paiement.''; - if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.''; - else print ' '; - print ''.price($objp->amount).''; - - if ($objp->statut == 0) + $objp = $db->fetch_object($resql); + $var=!$var; + print "
'.img_object($langs->trans("ShowPayment"),"payment").''; + + print ' '.$objp->rowid.''.dolibarr_print_date($objp->dp).''.$langs->trans("PaymentTypeShort".$objp->paiement_code).' '.$objp->num_paiement.''; + if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.''; + else print ' '; + print ''.price($objp->amount).''; + + if ($objp->statut == 0) { - print ''.$langs->trans("ToValidate").''; + print ''.$langs->trans("ToValidate").''; } - else + else { - print img_tick(); + print img_tick(); } - - print '
"; + print "\n"; + print "\n"; } else {