From 8382e35e5d2aae68c7ab553890ab47de09a1b29c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 9 May 2004 14:16:38 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Modifications=20esth=E9tiques=20mineure?=
 =?UTF-8?q?s=20sur=20les=20contrats.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/contrat/fiche.php | 31 +++++++++++++++++++++++--------
 htdocs/contrat/index.php |  2 +-
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index a20dd4af15f..a3b375e08b0 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -170,7 +170,7 @@ else
 	      print '<td>Société</td><td colspan="4">'.$contrat->societe->nom_url.'</td></tr>';
 	    }
 
-	  print '<tr><td>Etat</td><td colspan="3">';
+	  print '<tr><td>Statut</td><td colspan="3">';
 	  if ($contrat->enservice)
 	    {
 	      print "En service";
@@ -184,27 +184,38 @@ else
 	    {
 	      print '<form action="fiche.php?id='.$id.'" method="post">';
 	      print '<input type="hidden" name="action" value="miseenservice">';
-	      print '<input type="hidden" name="duration" value="'.$contrat->product->duration.'">';
-	      print '<tr><td>Mis en service</td><td colspan="3">';
+	      print '<tr><td>Date de mise en service</td><td colspan="3">';
 	      print $html->select_date('','re',1,1);
 	      print "&nbsp;";
-	      print '<input type="submit" value="Enregistrer"></td></tr>';
+	      print '</td></tr>';
+	      print '<tr><td>Date de fin</td><td colspan="3">';
+	      
+	      // TODO : Offrir le choix de la date de fin de contrat par la durée prédéfinie ou par
+	      // une date explicite.
+	      print $contrat->product->duration." après";
+	      //print "<br>";$html->select_date('','fin',1,1);
+	      
+	      print '<input type="hidden" name="duration" value="'.$contrat->product->duration.'">';
+	      print '</td></tr>';
+	      print '<tr><td colspan="4" align="center">';
+	      print '<input type="submit" value="Enregistrer">';
+	      print '</td></tr>';
 	      print '</form>';
 	    }
 
 	  if ($contrat->enservice > 0)
 	    {
-	      print "<tr><td valign=\"top\">Mis en service</td><td>".strftime("%A %e %B %Y à %H:%M",$contrat->mise_en_service);
+	      print "<tr><td valign=\"top\">Mis en service</td><td>".dolibarr_print_date($contrat->mise_en_service,"%d %B %Y à %H:%M");
 	      print "</td>";
 	      $contrat->user_service->fetch();
 	      print '<td>par</td><td>'.$contrat->user_service->fullname.'</td></tr>';
 	      
-	      print '<tr><td valign="top">Fin de validité</td><td colspan="3">'.strftime("%A %e %B %Y à %H:%M",$contrat->date_fin_validite);
+	      print '<tr><td valign="top">Fin de validité</td><td colspan="3">'.dolibarr_print_date($contrat->date_fin_validite,"%d %B %Y à %H:%M");
 	    }
 	  
 	  if ($contrat->enservice == 2)
 	    {
-	      print "<tr><td valign=\"top\">Cloturé</td><td>".strftime("%A %e %B %Y à %H:%M",$contrat->date_cloture)."</td>";
+	      print "<tr><td valign=\"top\">Cloturé</td><td>".dolibarr_print_date($contrat->date_cloture,"%d %B %Y à %H:%M")."</td>";
 	      $contrat->user_cloture->fetch();
 	      print '<td>par</td><td>'.$contrat->user_cloture->fullname.'</td></tr>';
 	    }
@@ -232,7 +243,11 @@ print '<div class="tabsAction">';
 
 if (! $contrat->enservice)
 {
-    print '<a class="tabAction" href="fiche.php?request=miseenservice&id='.$id.'">Mise en service</a>';
+    if ($request != 'miseenservice') {
+        print '<a class="tabAction" href="fiche.php?request=miseenservice&id='.$id.'">Mettre en service...</a>';
+    } else {
+        print '<a class="tabAction" href="fiche.php?id='.$id.'">Ne pas mettre en service</a>';
+    }
 }
 elseif ($contrat->enservice == 1)
 {
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index e27db8c7906..0ad193b2ff0 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -77,7 +77,7 @@ if ( $db->query($sql) )
   print "</td><td>";
   print_liste_field_titre("Société",$PHP_SELF, "s.nom");
   print '</td><td align="center">';
-  print_liste_field_titre("Etat",$PHP_SELF, "c.enservice");
+  print_liste_field_titre("Statut",$PHP_SELF, "c.enservice");
   print '</td>';
   print '</td><td align="center">';
   print_liste_field_titre("Fin",$PHP_SELF, "c.fin_validite");