From bc8a221a53970ff9835c7428ebb765e85320a08f Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Fri, 26 Nov 2004 14:57:59 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20suppression=20impossible=20quand=20un?=
 =?UTF-8?q?=20service=20est=20activ=E9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/contrat/fiche.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index ea8f887cb66..deeed17cc27 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -551,7 +551,7 @@ else
 		      print '<td>&nbsp;</td>';
 		    }
 		  print '<td align="right">'.price($objp->subprice)."</td>\n";
-		  if ($contrat->statut == 0  && $user->rights->contrat->creer) 
+		  if ($contrat->statut == 0  && $objp->statut == 0 && $user->rights->contrat->creer) 
 		    {
 		      print '<td align="right"><a href="fiche.php?id='.$id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
 		      print img_edit();
@@ -562,7 +562,7 @@ else
 		    }
 		  else
 		    {
-		      print '<td>&nbsp;</td><td>&nbsp;</td>';
+		      print '<td colspan="2">&nbsp;</td>';
 		    }
 		  print "</tr>\n";