From 1778b88f3564137718916da038701cc8c2a2a2a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 14 Jan 2008 18:56:33 +0000
Subject: [PATCH] Fix: Le dico des types d'action visible uniquement si module
 agenda actif

---
 htdocs/admin/dict.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index e1c125e1609..61f17356f21 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -187,12 +187,12 @@ $tabrowid[14]= "";
 $tabrowid[15]= "";
 
 // Condition to show dictionnary in setup page
-$tabcond[1] = $conf->societe->enabled;
+$tabcond[1] = true;
 $tabcond[2] = true;
 $tabcond[3] = true;
 $tabcond[4] = true;
 $tabcond[5] = $conf->societe->enabled;
-$tabcond[6] = true;
+$tabcond[6] = $conf->agenda->enabled;
 $tabcond[7] = $conf->tax->enabled;
 $tabcond[8] = $conf->societe->enabled;
 $tabcond[9] = true;
@@ -638,23 +638,33 @@ else
      */
 
     $var=true;
+	$lastlineisempty=false;
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Dictionnary").'</td><td>'.$langs->trans("Table").'</td></tr>';
+    print '<tr class="liste_titre">';
+	//print '<td>'.$langs->trans("Module").'</td>';
+	print '<td>'.$langs->trans("Dictionnary").'</td>';
+	print '<td>'.$langs->trans("Table").'</td>';
+	print '</tr>';
 
     foreach ($taborder as $i)
     {
         if ($tabname[$i] && ! $tabcond[$i]) continue;	// If dictionnary and condition not true
         
-        $var=!$var;
         if ($i)
         {
-            $value=$tabname[$i];
+			$var=!$var;
+			$value=$tabname[$i];
             print '<tr '.$bc[$var].'><td width="30%"><a href="dict.php?id='.$i.'">'.$tablib[$i].'</a></td><td>'.$tabname[$i].'</td></tr>';
-
+			$lastlineisempty=false;
         }
         else
         {
-            print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td></tr>';
+			if (! $lastlineisempty)
+			{
+				$var=!$var;
+				print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td></tr>';
+				$lastlineisempty=true;
+			}
         }
     }
     print '</table>';