Simplifications diverses des fonctionnalit�s

htdocs/admin/ihm.php

@@ -117,11 +117,6 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
     print $html->selectyesno('main_show_bugtrack_link',$conf->global->MAIN_SHOW_BUGTRACK_LINK,1);
     print '</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ShowWorkBoard").'</td><td>';
-    print $html->selectyesno('main_show_workboard',$conf->global->MAIN_SHOW_WORKBOARD,1);
-    print '</td></tr>';
-
     // Désactiver javascript
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
@@ -246,10 +241,6 @@ else
     print '<tr '.$bc[$var].'"><td width="35%">'.$langs->trans("ShowBugTrackLink").'</td><td>';   
     print yn($conf->global->MAIN_SHOW_BUGTRACK_LINK)."</td></tr>";
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ShowWorkBoard").'</td><td>';   
-    print yn($conf->global->MAIN_SHOW_WORKBOARD)."</td></tr>";
-
     // Disable javascript
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';   

htdocs/admin/menus.php

@@ -79,10 +79,13 @@ $head[$h][1] = $langs->trans("MenuHandlers");
 $head[$h][2] = 'handler';
 $h++;
 
-$head[$h][0] = DOL_URL_ROOT."/admin/menus/index.php";
+if ($conf->global->MAIN_LEVEL_FEATURES >= 1)
-$head[$h][1] = $langs->trans("MenuAdmin");
+{
-$head[$h][2] = 'editor';
+	$head[$h][0] = DOL_URL_ROOT."/admin/menus/index.php";
-$h++;
+	$head[$h][1] = $langs->trans("MenuAdmin");
+	$head[$h][2] = 'editor';
+	$h++;
+}
 
 dolibarr_fiche_head($head, 'handler', $langs->trans("Menus"));
 

htdocs/index.php

@@ -233,26 +233,23 @@ print '</td><td width="65%" valign="top" class="notopnoleftnoright">';
 /*
  * Dolibarr Work Board
  */
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">'.$langs->trans("DolibarrWorkBoard").'</td>';
+print '<td align="right">'.$langs->trans("Number").'</td>';
+print '<td align="right">'.$langs->trans("Late").'</td>';
+print '<td>&nbsp;</td>';
+print '<td width="20">&nbsp;</td>';
+print '</tr>';
 
-if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
+$var=true;
+//
+// Ne pas inclure de sections sans gestion de permissions
+//
+
+// Nbre actions à faire (en retard)
+if (($conf->commercial->enabled || $conf->compta->enabled || $conf->comptaexpert->enabled)  && $user->rights->actions->lire)
 {
-  print '<table class="noborder" width="100%">';
-  print '<tr class="liste_titre">';
-  print '<td colspan="2">'.$langs->trans("DolibarrWorkBoard").'</td>';
-  print '<td align="right">'.$langs->trans("Number").'</td>';
-  print '<td align="right">'.$langs->trans("Late").'</td>';
-  print '<td>&nbsp;</td>';
-  print '<td width="20">&nbsp;</td>';
-  print '</tr>';
-  
-  $var=true;
-  //
-  // Ne pas inclure de sections sans gestion de permissions
-  //
-  
-  // Nbre actions à faire (en retard)
-  if (($conf->commercial->enabled || $conf->compta->enabled || $conf->comptaexpert->enabled)  && $user->rights->actions->lire)
-    {
   include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
   $board=new ActionComm($db);
   $board->load_board($user);
@@ -273,12 +270,12 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    print "\n";
+print "\n";
-    }
+}
 
-  // Nbre commandes clients à honorer
+// Nbre commandes clients à honorer
-  if ($conf->commande->enabled && $user->rights->commande->lire)
+if ($conf->commande->enabled && $user->rights->commande->lire)
-    {
+{
   include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
   $board=new Commande($db);
   $board->load_board($user);
@@ -297,12 +294,12 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    print "\n";
+print "\n";
-    }
+}
 
-  // Nbre propales ouvertes (expirées)
+// Nbre propales ouvertes (expirées)
-  if ($conf->propal->enabled && $user->rights->propale->lire)
+if ($conf->propal->enabled && $user->rights->propale->lire)
-    {
+{
   $langs->load("propal");
   
   include_once(DOL_DOCUMENT_ROOT."/propal.class.php");
@@ -323,11 +320,11 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    }
+}
 
-  // Nbre propales fermées signées (à facturer)
+// Nbre propales fermées signées (à facturer)
-  if ($conf->propal->enabled && $user->rights->propale->lire)
+if ($conf->propal->enabled && $user->rights->propale->lire)
-    {
+{
   $langs->load("propal");
 
   include_once(DOL_DOCUMENT_ROOT."/propal.class.php");
@@ -348,12 +345,12 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    print "\n";
+print "\n";
-    }
+}
 
-  // Nbre services à activer (en retard)
+// Nbre services à activer (en retard)
-  if ($conf->contrat->enabled && $user->rights->contrat->lire)
+if ($conf->contrat->enabled && $user->rights->contrat->lire)
-    {
+{
   $langs->load("contracts");
 
   include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
@@ -374,12 +371,12 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    print "\n";
+print "\n";
-    }
+}
 
-  // Nbre services actifs (à renouveler)
+// Nbre services actifs (à renouveler)
-  if ($conf->contrat->enabled && $user->rights->contrat->lire)
+if ($conf->contrat->enabled && $user->rights->contrat->lire)
-    {
+{
   $langs->load("contracts");
 
   include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
@@ -400,12 +397,12 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    print "\n";
+print "\n";
-    }
+}
 
-  // Nbre factures fournisseurs (à payer)
+// Nbre factures fournisseurs (à payer)
-  if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->facture->lire)
+if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->facture->lire)
-    {
+{
   $langs->load("bills");
 
   include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php");
@@ -426,12 +423,12 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    print "\n";
+print "\n";
-    }
+}
 
-  // Nbre factures clients (à payer)
+// Nbre factures clients (à payer)
-  if ($conf->facture->enabled && $user->rights->facture->lire)
+if ($conf->facture->enabled && $user->rights->facture->lire)
-    {
+{
   $langs->load("bills");
   
   include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
@@ -452,12 +449,12 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    print "\n";
+print "\n";
-    }
+}
 
-  // Nbre ecritures à rapprocher
+// Nbre ecritures à rapprocher
-  if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id)
+if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id)
-    {
+{
   $langs->load("banks");
 
   include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php");
@@ -478,12 +475,12 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    print "\n";
+print "\n";
-    }
+}
 
   // Nbre ecritures à rapprocher
-  if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id)
+if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id)
-    {
+{
   $langs->load("banks");
 
   include_once(DOL_DOCUMENT_ROOT."/compta/paiement/cheque/remisecheque.class.php");
@@ -504,12 +501,12 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    print "\n";
+print "\n";
-    }
+}
 
-  // Nbre adhérent valides (attente cotisation)
+// Nbre adhérent valides (attente cotisation)
-  if ($conf->adherent->enabled && $user->rights->adherent->lire && ! $user->societe_id)
+if ($conf->adherent->enabled && $user->rights->adherent->lire && ! $user->societe_id)
-    {
+{
   $langs->load("members");
 
   include_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
@@ -530,12 +527,11 @@ if ($conf->global->MAIN_SHOW_WORKBOARD == 1)
   else print '&nbsp;';
   print '</td>';
   print '</tr>';
-    print "\n";
+print "\n";
-    }
-
-  print '</table>';
 }
 
+print '</table>';
+
 print '</td></tr></table>'; 
 
 

htdocs/user/home.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,10 +40,7 @@ $langs->load("users");
 llxHeader();
 
 
-$lien="";
+print_fiche_titre($langs->trans("MenuUsersAndGroups"));
-if ($user->admin) $lien='<a href="'.DOL_URL_ROOT.'/admin/perms.php">'.img_picto($langs->trans("Setup"),"setup").' '.$langs->trans("Setup").'</a>';
-
-print_fiche_titre($langs->trans("MenuUsersAndGroups"),$lien);
 
 
 print '<table border="0" width="100%" class="notopnoleftnoright">';