diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index adef351f64d..728e0d750a5 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -139,12 +139,39 @@ if ($_GET["facid"] > 0)
print '
'.price($fac->total_ttc).' | ';
print ''.$conf->monnaie.' | | ';
+ print '| RIB | ';
+ print $soc->display_rib();
+ print ' |
';
+
print "";
+ /*
+ *
+ *
+ */
+
+ $sql = "SELECT pfd.rowid, pfd.traite,".$db->pdate("pfd.date_demande")." as date_demande";
+ $sql .= " ,".$db->pdate("pfd.date_traite")." as date_traite";
+ $sql .= " , pfd.fk_prelevement, pfd.amount";
+ $sql .= " , u.name, u.firstname";
+ $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+ $sql .= " , ".MAIN_DB_PREFIX."user as u";
+ $sql .= " WHERE fk_facture = ".$fac->id;
+ $sql .= " AND pfd.fk_user_demande = u.rowid";
+ $sql .= " AND pfd.traite = 0";
+ $sql .= " ORDER BY pfd.date_demande DESC";
+
+ $result_sql = $db->query($sql);
+ if ($result_sql)
+ {
+ $num = $db->num_rows();
+ }
+
+
print "\n";
// Valider
- if ($fac->statut > 0 && $fac->paye == 0 && $fac->mode_reglement == 3)
+ if ($fac->statut > 0 && $fac->paye == 0 && $fac->mode_reglement == 3 && $num == 0)
{
if ($user->rights->facture->creer)
{
@@ -156,31 +183,19 @@ if ($_GET["facid"] > 0)
/*
* Prélèvement
*/
+ print '
';
- print '';
print '';
print '| Date demande | ';
print 'Date traitement | ';
+ print 'Montant | ';
print 'Bon prélèvement | ';
print ''.$langs->trans("User").' | | | ';
print '
';
$var=True;
- $sql = "SELECT pfd.rowid, pfd.traite,".$db->pdate("pfd.date_demande")." as date_demande";
- $sql .= " ,".$db->pdate("pfd.date_traite")." as date_traite";
- $sql .= " , pfd.fk_prelevement";
- $sql .= " , u.name, u.firstname";
- $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
- $sql .= " , ".MAIN_DB_PREFIX."user as u";
- $sql .= " WHERE fk_facture = ".$fac->id;
- $sql .= " AND pfd.fk_user_demande = u.rowid";
- $sql .= " AND pfd.traite = 0";
- $sql .= " ORDER BY pfd.date_demande DESC";
-
- $result = $db->query($sql);
- if ($result)
+ if ($result_sql)
{
- $num = $db->num_rows();
$i = 0;
while ($i < $num)
@@ -191,6 +206,7 @@ if ($_GET["facid"] > 0)
print "";
print '| '.strftime("%d/%m/%Y",$obj->date_demande)." | \n";
print 'En attente de traitement | ';
+ print ''.price($obj->amount).' | ';
print '- | ';
print ''.$obj->firstname." ".$obj->name.' | ';
print '';
@@ -235,6 +251,7 @@ if ($_GET["facid"] > 0)
print ' | '.strftime("%d/%m/%Y",$obj->date_demande)." | \n";
print ''.strftime("%d/%m/%Y",$obj->date_traite)." | \n";
+ print ''.price($obj->amount).' | ';
print '';
print ''.$obj->fk_prelevement." | \n";