From d2a59f34217518454c4309382343b3120fb3e839 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 6 Mar 2004 18:49:27 +0000
Subject: [PATCH] =?UTF-8?q?Supression=20de=20tests=20inutiles=20et=20rempl?=
 =?UTF-8?q?acement=20d'un=20test=20sur=20une=20constante=20par=20son=20=E9?=
 =?UTF-8?q?quivalent=20$conf->?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index d0a54b9ccdb..de026bf13e0 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -312,12 +312,12 @@ if ($socid > 0)
 
     print '<br><div class="tabsAction">';
 
-    if ($conf->propal->enabled && defined("MAIN_MODULE_PROPALE") && MAIN_MODULE_PROPALE && $user->rights->propale->creer)
+    if ($conf->propal->enabled && $user->rights->propale->creer)
       {
 	print '<a class="tabAction" href="addpropal.php?socidp='.$objsoc->idp.'&amp;action=create">Créer une proposition</a>';
       }
 
-    if ($conf->commande->enabled && defined("MAIN_MODULE_COMMANDE") && MAIN_MODULE_COMMANDE && $user->rights->commande->creer)
+    if ($conf->commande->enabled && $user->rights->commande->creer)
       {
 	print '<a class="tabAction" href="'.DOL_URL_ROOT.'/commande/fiche.php?socidp='.$objsoc->idp.'&amp;action=create">Créer une commande</a>';
       }
@@ -327,7 +327,7 @@ if ($socid > 0)
 	print '<a class="tabAction" href="../projet/fiche.php?socidp='.$socid.'&action=create">Créer un projet</a>';
       }
 
-    if (defined("MAIN_MODULE_FICHEINTER") && MAIN_MODULE_FICHEINTER)
+    if ($conf->fichinter->enabled)
       {
 	print '<a class="tabAction" href="../fichinter/fiche.php?socidp='.$objsoc->idp.'&amp;action=create">Intervention</a>';
       }
@@ -340,7 +340,7 @@ if ($socid > 0)
      *
      */
     if ($action == 'changevalue') {
-      print "<HR noshade>";
+      print "<hr noshade>";
       print "<form action=\"index.php?socid=$objsoc->idp\" method=\"post\">";
       print "<input type=\"hidden\" name=\"action\" value=\"cabrecrut\">";
       print "Cette société est un cabinet de recrutement : ";