From 3658c82487101cb905d70fd43a441f3413b1c525 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 15 May 2004 16:16:09 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20La=20date=20de=20fin=20de=20mise=20en=20?=
 =?UTF-8?q?service=20ne=20doit=20pas=20=EAtre=20affich=E9e=20si=20le=20con?=
 =?UTF-8?q?trat=20n'est=20pas=20en=20service.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/contrat/index.php | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 0ad193b2ff0..146619383ed 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -93,23 +93,38 @@ if ( $db->query($sql) )
       print "<td><a href=\"fiche.php?id=$obj->cid\">$obj->cid</a></td>\n";
       print "<td><a href=\"../product/fiche.php?id=$obj->pid\">$obj->label</a></td>\n";
       print "<td><a href=\"../comm/fiche.php?socid=$obj->sidp\">$obj->nom</a></td>\n";
-      print '<td align="center">';
+
+      // Affiche statut contrat
       if ($obj->enservice == 1)
 	{
-	  print "En service</td>";
+  	  $class = "impayee";
+	  $statut="En service";
 	}
       elseif($obj->enservice == 2)
 	{
-	  print "Cloturé</td>";
+   	  $class = "normal";
+	  $statut= "Cloturé";
 	}
       else
 	{
-	  print "A mettre en service</td>";
+  	  $class = "warning";
+	  $statut= "A mettre en service";
 	}
-      $time=strtotime($obj->fin_validite);
-      print "<td>".dolibarr_print_date($time)."</td>\n";
-      print "</tr>\n";
-      $i++;
+    print "<td align=\"center\" class=\"$class\">";
+    print "$statut";
+	print "</td><td>";
+
+    if ($obj->enservice > 0) {
+	    $time=strtotime($obj->fin_validite);
+        print dolibarr_print_date($time);
+    }
+    else {
+        print "&nbsp;";   
+    }
+    print "</td>\n";
+
+    print "</tr>\n";
+    $i++;
     }
   $db->free();