diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index a7e98a0b2fc..3a819909c8b 100644 --- a/htdocs/compta/paiement/avalider.php +++ b/htdocs/compta/paiement/avalider.php @@ -31,6 +31,7 @@ require("./pre.inc.php"); $user->getrights("facture"); +$langs->load("bills"); // Sécurité accés client if (! $user->rights->facture->lire) @@ -87,10 +88,10 @@ if ($resql) print ''; print ''; - print_liste_field_titre($langs->trans("Ref"),"avalider.php","p.rowid","","","",$sortfield); - print_liste_field_titre($langs->trans("Date"),"avalider.php","dp","","","",$sortfield); + print_liste_field_titre($langs->trans("Ref"),"avalider.php","p.rowid","","",'width="60"',$sortfield); + print_liste_field_titre($langs->trans("Date"),"avalider.php","dp","","",'width="80" align="center"',$sortfield); print_liste_field_titre($langs->trans("Type"),"avalider.php","c.libelle","","","",$sortfield); - print ''; + print_liste_field_titre($langs->trans("AmountTTC"),"avalider.php","c.libelle","","",'align="right"',$sortfield); print ""; print "\n"; @@ -100,14 +101,14 @@ if ($resql) $var=!$var; print ""; print ''; - print '\n"; + print '\n"; print "\n"; print ''; print '
'.$langs->trans("AmountTTC").' 
'.''.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.''.dolibarr_print_date($objp->dp)."'.dolibarr_print_date($objp->dp)."$objp->paiement_type $objp->num_paiement'.price($objp->amount).''; if ($objp->statut == 0) { - print ''.$langs->trans("ToValid").''; + print ''.$langs->trans("PaymentStatusToValidShort").''; } else { @@ -123,5 +124,5 @@ if ($resql) $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index bc7bcef9905..5311b4a7d5b 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -64,8 +64,8 @@ $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.= " ba.rowid as bid, ba.label"; -$sql.= " FROM ".MAIN_DB_PREFIX."paiement as p,"; -$sql.= " ".MAIN_DB_PREFIX."c_paiement as c"; +$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as c,"; +$sql.= " ".MAIN_DB_PREFIX."paiement as p"; $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 ($socidp)