From 96f925150f3ebc3e15344f0439b4001651abfcaa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 8 Dec 2005 23:53:43 +0000
Subject: [PATCH] Fix: Affiche message erreur sur creation prelevement

---
 htdocs/compta/prelevement/create.php   | 14 +++++++++++++-
 htdocs/compta/prelevement/demandes.php | 18 ++++++++++--------
 htdocs/compta/prelevement/pre.inc.php  | 10 +++++-----
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 20044688873..3009c06aece 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -40,6 +40,14 @@ if ($_GET["action"] == 'create')
 {
     $bprev = new BonPrelevement($db);
     $result=$bprev->create($_GET["banque"],$_GET["guichet"]);
+    if ($result < 0)
+    {
+        $mesg='<div class="error">'.$bprev->error.'</div>';
+    }
+    if ($result == 0)
+    {
+        $mesg='<div class="error">Aucune facture prélevable, prélevé avec succès</div>';
+    }
 }
 
 
@@ -57,7 +65,10 @@ $bprev = new BonPrelevement($db);
 $nb=$bprev->NbFactureAPrelever();
 $nb1=$bprev->NbFactureAPrelever(1);
 $nb11=$bprev->NbFactureAPrelever(1,1);
-
+if ($nb < 0 || $nb1 < 0 || $nb11 < 0)
+{
+    dolibarr_print_error($bprev->error);
+}
 print '<table class="border" width="100%">';
 print '<tr><td>Nb de facture à prélever :</td>';
 print '<td align="right">';
@@ -78,6 +89,7 @@ print '</tr></table>';
 
 print '</div>';
 
+if ($mesg) print $mesg;
 
 if ($nb)
 {
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 6b9c1381167..30a1629b29f 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -58,17 +58,19 @@ if (! $sortfield) $sortfield="f.facnumber";
 
 
 /*
- * Demandes en attente
+ * Liste de demandes
  *
  */
 
-$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp";
-$sql .= " , ".$db->pdate("pfd.date_demande")." as date_demande";
-$sql .= " , pfd.fk_user_demande";
-$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-$sql .= " WHERE s.idp = f.fk_soc";
-$sql .= " AND pfd.traite = 0 AND pfd.fk_facture = f.rowid";
+$sql= "SELECT f.facnumber, f.rowid, s.nom, s.idp";
+$sql.= " , ".$db->pdate("pfd.date_demande")." as date_demande";
+$sql.= " , pfd.fk_user_demande";
+$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
+$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+$sql.= " WHERE s.idp = f.fk_soc";
+if (! $statut) $sql.= " AND pfd.traite = 0";
+if ($statut) $sql.= " AND pfd.traite = ".$statut;
+$sql.= " AND pfd.fk_facture = f.rowid";
 if (strlen(trim($_GET["search_societe"])))
 {
   $sql .= " AND s.nom LIKE '%".$_GET["search_societe"]."%'";
diff --git a/htdocs/compta/prelevement/pre.inc.php b/htdocs/compta/prelevement/pre.inc.php
index 29e9bbffd00..bad72a3eea5 100644
--- a/htdocs/compta/prelevement/pre.inc.php
+++ b/htdocs/compta/prelevement/pre.inc.php
@@ -18,13 +18,12 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
-    \file       htdocs/compta/prelevement/pre.inc.php
-    \ingroup    prelevement
-    \brief      Fichier gestionnaire du menu prelevement
+        \file       htdocs/compta/prelevement/pre.inc.php
+        \ingroup    prelevement
+        \brief      Fichier gestionnaire du menu prelevement
 */
 
 require("../../main.inc.php");
@@ -36,6 +35,7 @@ $langs->load("bills");
 
 $user->getrights("prelevement");
 
+
 function llxHeader($head = "", $title="", $help_url='')
 {
   global $user, $conf, $langs;
@@ -65,7 +65,7 @@ function llxHeader($head = "", $title="", $help_url='')
 	  
 	  $menu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("Demandes"));
 	  $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrderToProcess"));
-	  $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandestraitees.php",$langs->trans("StandingOrderProcessed"));
+	  $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php?statut=1",$langs->trans("StandingOrderProcessed"));
 	  
 	}      
     }