From 03356003bf35c1c039d89d8421d3d8a81943e914 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Sat, 28 Dec 2002 00:13:44 +0000
Subject: [PATCH] *** empty log message ***

---
 htdocs/compta/dons/edit.php  | 49 ++++++++++++++++++++++++------------
 htdocs/compta/dons/fiche.php | 22 ++++++++--------
 htdocs/don.class.php         |  1 +
 3 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/htdocs/compta/dons/edit.php b/htdocs/compta/dons/edit.php
index 979280b372e..3814ab7f672 100644
--- a/htdocs/compta/dons/edit.php
+++ b/htdocs/compta/dons/edit.php
@@ -37,6 +37,7 @@ if ($action == 'update')
       $don->id          = $HTTP_POST_VARS["rowid"];
       $don->prenom      = $prenom;
       $don->nom         = $nom;  
+      $don->statut      = $HTTP_POST_VARS["statutid"];  
       $don->societe     = $societe;
       $don->adresse     = $adresse;
       $don->amount      = $amount;
@@ -67,6 +68,8 @@ if ($action == 'update')
 llxHeader();
 
 
+if ($rowid)
+{
 
   $don = new Don($db);
   $don->id = $rowid;
@@ -92,13 +95,27 @@ llxHeader();
   print "<input type=\"hidden\" name=\"action\" value=\"update\">";
   print "<input type=\"hidden\" name=\"rowid\" value=\"$rowid\">";
   
-  print "<tr><td>Date du don :</td><td>";
+  print "<tr><td>Date du don</td><td>";
   print_date_select($don->date);
   print "</td>";
   
-  print '<td rowspan="11" valign="top">Commentaires :<br>';
+  print '<td rowspan="13" valign="top">Commentaires :<br>';
   print '<textarea name="comment" wrap="soft" cols="40" rows="15">'.$don->commentaire.'</textarea></td></tr>';
-  print "<tr><td>Type :</td><td>\n";
+
+  print "<tr><td>Statut du don</td><td>";
+
+  $listst[0] = "Promesse à valider";
+  $listst[1] = "Promesse validée";
+  $listst[2] = "Don payé";
+  $listst[3] = "Don encaissé";
+
+
+  $sel = new Form($db);
+  $sel->select_array("statutid",$listst,$don->statut);
+
+  print "</td></tr>";
+
+  print "<tr><td>Mode de paiement</td><td>\n";
   
   $paiement = new Paiement($db);
 
@@ -106,7 +123,7 @@ llxHeader();
 
   print "</td></tr>\n";
 
-  print "<tr><td>Projet :</td><td>\n";
+  print "<tr><td>Projet</td><td>\n";
 
   $prj = new ProjetDon($db);
   $listeprj = $prj->liste_array();
@@ -118,17 +135,17 @@ llxHeader();
   print "<br>";
   print "</td></tr>\n";
 
-  print "<tr><td>Don public :</td><td><select name=\"public\">\n";
-if ($don->public) 
-{
-  print '<option value="1" SELECTED>oui</option>';
-  print '<option value="0">non</option>';
-}
-else
-{
-  print '<option value="1">oui</option>';
-  print '<option value="0" SELECTED>non</option>';
-}
+  print "<tr><td>Don public</td><td><select name=\"public\">\n";
+  if ($don->public) 
+    {
+      print '<option value="1" SELECTED>oui</option>';
+      print '<option value="0">non</option>';
+    }
+  else
+    {
+      print '<option value="1">oui</option>';
+      print '<option value="0" SELECTED>non</option>';
+    }
   print "</select><br>";
   print "</td></tr>\n";
 
@@ -145,7 +162,7 @@ else
   print "</form>\n";
   print "</table>\n";
        
-
+}
 
 $db->close();
 
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 675881e95c6..a5ed52d0f05 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -130,13 +130,13 @@ if ($action == 'create') {
   
   print "<input type=\"hidden\" name=\"action\" value=\"add\">";
   
-  print "<tr><td>Date du don :</td><td>";
+  print "<tr><td>Date du don</td><td>";
   print_date_select();
   print "</td>";
   
   print '<td rowspan="11" valign="top">Commentaires :<br>';
   print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\"></textarea></td></tr>";
-  print "<tr><td>Type :</td><td>\n";
+  print "<tr><td>Mode de paiement</td><td>\n";
   
   $paiement = new Paiement($db);
 
@@ -144,7 +144,7 @@ if ($action == 'create') {
 
   print "</td></tr>\n";
 
-  print "<tr><td>Projet :</td><td><select name=\"projetid\">\n";
+  print "<tr><td>Projet</td><td><select name=\"projetid\">\n";
   
   $sql = "SELECT rowid, libelle FROM llx_don_projet ORDER BY rowid";
   
@@ -166,7 +166,7 @@ if ($action == 'create') {
   print "</select><br>";
   print "</td></tr>\n";
 
-  print "<tr><td>Don public :</td><td><select name=\"public\">\n";
+  print "<tr><td>Don public</td><td><select name=\"public\">\n";
   
   print '<option value="1">oui</option>';
   print '<option value="0">non</option>';
@@ -205,7 +205,7 @@ if ($rowid > 0 && $action == 'edit')
   print "<form action=\"$PHP_SELF\" method=\"post\">";
   print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
   
-  print "<tr><td>Date du don :</td><td>";
+  print "<tr><td>Date du don</td><td>";
   print strftime("%d %B %Y",$don->date);
   print "</td>";
   
@@ -214,7 +214,7 @@ if ($rowid > 0 && $action == 'edit')
 
   if ($don->statut == 1)
     {
-      print "<tr><td>Type :</td><td>";
+      print "<tr><td>Mode de paiement</td><td>";
       $paiement = new Paiement($db);
       $paiement->select("modepaiement","crédit", $don->modepaiementid);
       print "</td></tr>\n";
@@ -222,14 +222,14 @@ if ($rowid > 0 && $action == 'edit')
 
   if ($don->statut > 1)
     {
-      print "<tr><td>Type :</td><td>";
+      print "<tr><td>Mode de paiement</td><td>";
       print $don->modepaiement;
       print "</td></tr>\n";
     }
 
-  print '<tr><td>Projet :</td><td>'.$don->projet.'</td></tr>';
+  print '<tr><td>Projet</td><td>'.$don->projet.'</td></tr>';
 
-  print "<tr><td>Don public :</td><td>";
+  print "<tr><td>Don public</td><td>";
 
   print $yn[$don->public];
   print "</td></tr>\n";
@@ -253,7 +253,7 @@ if ($rowid > 0 && $action == 'edit')
    * Case 1
    */
 
-  print '<td align="center" width="25%"><a href="edit.php?rowid='.$don->id.'">Editer</a></td>';
+  print '<td align="center" width="25%">[<a href="edit.php?rowid='.$don->id.'">Editer</a>]</td>';
 	
   /*
    * Case 2
@@ -298,7 +298,7 @@ if ($rowid > 0 && $action == 'edit')
     }
   elseif ($don->statut == 2)
     {
-      print "<td align=\"center\" width=\"25%\"><a href=\"$PHP_SELF?rowid=$don->id&action=set_encaisse\">Encaissé</a></td>";
+      print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?rowid=$don->id&action=set_encaisse\">Encaisser</a>]</td>";
     }
   else
     {
diff --git a/htdocs/don.class.php b/htdocs/don.class.php
index 10823187d28..0b7072d9a37 100644
--- a/htdocs/don.class.php
+++ b/htdocs/don.class.php
@@ -213,6 +213,7 @@ class Don
       $sql .= ",note='".$this->commentaire."'";
       $sql .= ",datedon='".$this->date."'";
       $sql .= ",email='".$this->email."'";
+      $sql .= ",fk_statut=".$this->statut;
 
       $sql .= " WHERE rowid = $this->id";