diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 268f8bee0ce..9ad5eef0360 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -66,14 +66,10 @@ if ($_GET["id"])
if ($bon->fetch($_GET["id"]) == 0)
{
-
dolibarr_fiche_head($head, $hselected, 'Prélèvement : '. $bon->ref);
-
print '
';
-
print '| Référence | '.$bon->ref.' |
';
-
print '
';
}
else
@@ -83,7 +79,7 @@ if ($_GET["id"])
}
$page = $_GET["page"];
-
+$rej = new RejetPrelevement($db, $user);
/*
* Liste des factures
*
@@ -91,13 +87,16 @@ $page = $_GET["page"];
*/
$sql = "SELECT pl.rowid, pl.amount, pl.statut";
$sql .= " , s.idp, s.nom";
+$sql .= " , pr.motif, pr.afacturer, pr.fk_facture";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql .= " , ".MAIN_DB_PREFIX."societe as s";
+$sql .= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
$sql .= " WHERE p.rowid=".$prev_id;
$sql .= " AND pl.fk_prelevement_bons = p.rowid";
$sql .= " AND pl.fk_soc = s.idp";
$sql .= " AND pl.statut = 3 ";
+$sql .= " AND pr.fk_prelevement_lignes = pl.rowid";
if ($_GET["socid"])
{
@@ -106,25 +105,24 @@ if ($_GET["socid"])
$sql .= " ORDER BY pl.amount DESC";
-$result = $db->query($sql);
-if ($result)
+$resql = $db->query($sql);
+if ($resql)
{
- $num = $db->num_rows($result);
+ $num = $db->num_rows($resql);
$i = 0;
print_barre_liste("Lignes de prélèvement rejetées", $page, "fiche-rejet.php", $urladd, $sortfield, $sortorder, '', $num);
print"\n\n";
print '';
print '';
- print '| Ligne | Société | Montant |
';
+ print 'Ligne | Société | Montant | Motif | A Facturer | Facture | ';
$var=True;
-
$total = 0;
while ($i < $num)
{
- $obj = $db->fetch_object($result);
+ $obj = $db->fetch_object($resql);
print "";
print ' ';
@@ -135,15 +133,23 @@ if ($result)
print ' | '.stripslashes($obj->nom)." | \n";
print ''.price($obj->amount)." | \n";
+ print ''.$rej->motifs[$obj->motif].' | ';
+
+ print ''.$langs->trans($yesno[$obj->afacturer]).' | ';
+ print ''.$obj->fk_facture.' | ';
print "
\n";
- $total += $obj->total_ttc;
+ $total += $obj->amount;
$var=!$var;
$i++;
}
- print "
";
- $db->free($result);
+ print "| | ";
+ print "Total | \n";
+ print ''.price($total)." | \n";
+ print ' | ';
+ print "
\n\n";
+ $db->free($resql);
}
else
{