diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 914d85c33fb..3dfc8a09138 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -18,14 +18,13 @@ * * $Id$ * $Source$ - * */ /** - \file htdocs/compta/paiement/liste.php - \ingroup compta - \brief Page liste des paiements des factures clients - \version $Revision$ + \file htdocs/compta/paiement/liste.php + \ingroup compta + \brief Page liste des paiements des factures clients + \version $Revision$ */ require("./pre.inc.php"); @@ -58,9 +57,12 @@ if (! $sortfield) $sortfield="p.rowid"; $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.libelle as paiement_type,"; +$sql.= " ba.rowid as bid, ba.label"; $sql.= " FROM ".MAIN_DB_PREFIX."paiement as p,"; $sql.= " ".MAIN_DB_PREFIX."c_paiement as c"; +$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"; $sql.= " WHERE p.fk_paiement = c.id"; if ($_GET["search_montant"]) @@ -68,8 +70,8 @@ if ($_GET["search_montant"]) $sql .=" AND p.amount=".ereg_replace(",",".",$_GET["search_montant"]); } - -if ($_GET["orphelins"]) { // Options qui ne sert qu'au debogage +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,"; @@ -98,9 +100,10 @@ if ($resql) 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,"",$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("AmountTTC"),"liste.php","p.amount","",$paramlist,'align="right"',$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"; @@ -108,13 +111,13 @@ if ($resql) // Lignes des champs de filtre print ''; print ''; - print ''; + print ''; print ''; print "\n"; print ''; @@ -125,18 +128,19 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; print ""; - print ''; - print '\n"; - print "\n"; + print ''; + print ''; + print ''; print ''; print '
  '; - print ''; + print ''; print ''; - print ''; + print ''; print '
'.img_object($langs->trans("ShowPayment"),"payment").''; + print ''.img_object($langs->trans("ShowPayment"),"payment").''; print ' '.$objp->rowid.''.dolibarr_print_date($objp->dp)."$objp->paiement_type $objp->num_paiement'.dolibarr_print_date($objp->dp).''.$objp->paiement_type.' '.$objp->num_paiement.''.$objp->label.''.price($objp->amount).''; if ($objp->statut == 0) { - print 'A valider'; + print ''.$langs->trans("ToValidate").''; } else {