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,309 +233,305 @@ 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%">';
+  include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
-  print '<tr class="liste_titre">';
+  $board=new ActionComm($db);
-  print '<td colspan="2">'.$langs->trans("DolibarrWorkBoard").'</td>';
+  $board->load_board($user);
-  print '<td align="right">'.$langs->trans("Number").'</td>';
+  $board->warning_delay=$conf->actions->warning_delay/60/60/24;
-  print '<td align="right">'.$langs->trans("Late").'</td>';
+  $board->label=$langs->trans("ActionsToDo");
-  print '<td>&nbsp;</td>';
+
-  print '<td width="20">&nbsp;</td>';
+  $var=!$var;
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Actions"),"task").'</td><td>'.$board->label.'</td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?status=todo">'.$board->nbtodo.'</a></td>';
+  print '<td align="right">';
+  print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?status=todo">';
+  print $board->nbtodolate;
+  print '</a></td><td nowrap align="right">';
+  print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')';
+  print '</td>';
+  print '<td>';
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
+  else print '&nbsp;';
+  print '</td>';
   print '</tr>';
+print "\n";
+}
+
+// Nbre commandes clients à honorer
+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);
+
+  $var=!$var;
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Orders"),"order").'</td><td>'.$langs->trans("OrdersToProcess").'</td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/commande/liste.php">'.$board->nbtodo.'</a></td>';
+  print '<td align="right">';
+  print '<a href="'.DOL_URL_ROOT.'/commande/liste.php">';
+  print $board->nbtodolate;
+  print '</a></td><td nowrap align="right">';
+  print ' (>'.ceil($conf->commande->traitement->warning_delay/60/60/24).' '.$langs->trans("days").')';
+  print '</td>';
+  print '<td>';
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
+  else print '&nbsp;';
+  print '</td>';
+  print '</tr>';
+print "\n";
+}
+
+// Nbre propales ouvertes (expirées)
+if ($conf->propal->enabled && $user->rights->propale->lire)
+{
+  $langs->load("propal");
   
-  $var=true;
+  include_once(DOL_DOCUMENT_ROOT."/propal.class.php");
-  //
+  $board=new Propal($db);
-  // Ne pas inclure de sections sans gestion de permissions
+  $board->load_board($user,"opened");
-  //
+
+  $var=!$var;
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Propals"),"propal").'</td><td>'.$langs->trans("PropalsToClose").'</td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal.php?viewstatut=1">'.$board->nbtodo.'</a></td>';
+  print '<td align="right">';
+  print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?viewstatut=1">';
+  print $board->nbtodolate;
+  print '</a></td><td nowrap align="right">';
+  print ' (>'.ceil($conf->propal->cloture->warning_delay/60/60/24).' '.$langs->trans("days").')';
+  print '</td>';
+  print '<td>';
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
+  else print '&nbsp;';
+  print '</td>';
+  print '</tr>';
+}
+
+// Nbre propales fermées signées (à facturer)
+if ($conf->propal->enabled && $user->rights->propale->lire)
+{
+  $langs->load("propal");
+
+  include_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+  $board=new Propal($db);
+  $board->load_board($user,"signed");
+
+  $var=!$var;
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Propals"),"propal").'</td><td>'.$langs->trans("PropalsToBill").'</td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal.php?viewstatut=2">'.$board->nbtodo.'</a></td>';
+  print '<td align="right">';
+  print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?viewstatut=2">';
+  print $board->nbtodolate;
+  print '</a></td><td nowrap align="right">';
+  print ' (>'.ceil($conf->propal->facturation->warning_delay/60/60/24).' '.$langs->trans("days").')';
+  print '</td>';
+  print '<td>';
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
+  else print '&nbsp;';
+  print '</td>';
+  print '</tr>';
+print "\n";
+}
+
+// Nbre services à activer (en retard)
+if ($conf->contrat->enabled && $user->rights->contrat->lire)
+{
+  $langs->load("contracts");
+
+  include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
+  $board=new Contrat($db);
+  $board->load_board($user,"inactives");
+
+  $var=!$var;
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Contract"),"contract").'</td><td>'.$langs->trans("BoardNotActivatedServices").'</td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=0">'.$board->nbtodo.'</a></td>';
+  print '<td align="right">';
+  print '<a href="'.DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=0">';
+  print $board->nbtodolate;
+  print '</a></td><td nowrap align="right">';
+  print ' (>'.ceil($conf->contrat->services->inactifs->warning_delay/60/60/24).' '.$langs->trans("days").')';
+  print '</td>';
+  print '<td>';
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
+  else print '&nbsp;';
+  print '</td>';
+  print '</tr>';
+print "\n";
+}
+
+// Nbre services actifs (à renouveler)
+if ($conf->contrat->enabled && $user->rights->contrat->lire)
+{
+  $langs->load("contracts");
+
+  include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
+  $board=new Contrat($db);
+  $board->load_board($user,"expired");
+
+  $var=!$var;
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Contract"),"contract").'</td><td>'.$langs->trans("BoardRunningServices").'</td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=4">'.$board->nbtodo.'</a></td>';
+  print '<td align="right">';
+  print '<a href="'.DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=4">';
+  print $board->nbtodolate;
+  print '</a></td><td nowrap align="right">';
+  print ' (>'.ceil($conf->contrat->services->expires->warning_delay/60/60/24).' '.$langs->trans("days").')';
+  print '</td>';
+  print '<td>';
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
+  else print '&nbsp;';
+  print '</td>';
+  print '</tr>';
+print "\n";
+}
+
+// Nbre factures fournisseurs (à payer)
+if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->facture->lire)
+{
+  $langs->load("bills");
+
+  include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php");
+  $board=new FactureFournisseur($db);
+  $board->load_board($user);
+
+  $var=!$var;
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Bills"),"bill").'</td><td>'.$langs->trans("SupplierBillsToPay").'</td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/fourn/facture/index.php?filtre=paye:0">'.$board->nbtodo.'</a></td>';
+  print '<td align="right">';
+  print '<a href="'.DOL_URL_ROOT.'/fourn/facture/index.php?filtre=paye:0">';
+  print $board->nbtodolate;
+  print '</a></td><td nowrap align="right">';
+  print ' (>'.ceil($conf->facture->fournisseur->warning_delay/60/60/24).' '.$langs->trans("days").')';
+  print '</td>';
+  print '<td>';
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
+  else print '&nbsp;';
+  print '</td>';
+  print '</tr>';
+print "\n";
+}
+
+// Nbre factures clients (à payer)
+if ($conf->facture->enabled && $user->rights->facture->lire)
+{
+  $langs->load("bills");
   
-  // Nbre actions à faire (en retard)
+  include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-  if (($conf->commercial->enabled || $conf->compta->enabled || $conf->comptaexpert->enabled)  && $user->rights->actions->lire)
+  $board=new Facture($db);
-    {
+  $board->load_board($user);
-      include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
-      $board=new ActionComm($db);
-      $board->load_board($user);
-      $board->warning_delay=$conf->actions->warning_delay/60/60/24;
-      $board->label=$langs->trans("ActionsToDo");
 
-      $var=!$var;
+  $var=!$var;
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Actions"),"task").'</td><td>'.$board->label.'</td>';
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Bills"),"bill").'</td><td>'.$langs->trans("CustomerBillsUnpayed").'</td>';
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?status=todo">'.$board->nbtodo.'</a></td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/impayees.php">'.$board->nbtodo.'</a></td>';
-      print '<td align="right">';
+  print '<td align="right">';
-      print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?status=todo">';
+  print '<a href="'.DOL_URL_ROOT.'/compta/facture/impayees.php">';
-      print $board->nbtodolate;
+  print $board->nbtodolate;
-      print '</a></td><td nowrap align="right">';
+  print '</a></td><td nowrap align="right">';
-      print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')';
+  print ' (>'.ceil($conf->facture->client->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
+  print '</td>';
-      print '<td>';
+  print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
+  else print '&nbsp;';
-      print '</td>';
+  print '</td>';
-      print '</tr>';
+  print '</tr>';
-    print "\n";
+print "\n";
-    }
+}
 
-  // Nbre commandes clients à honorer
+// Nbre ecritures à rapprocher
-  if ($conf->commande->enabled && $user->rights->commande->lire)
+if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id)
-    {
+{
-      include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
+  $langs->load("banks");
-      $board=new Commande($db);
-      $board->load_board($user);
 
-      $var=!$var;
+  include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php");
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Orders"),"order").'</td><td>'.$langs->trans("OrdersToProcess").'</td>';
+  $board=new Account($db);
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/commande/liste.php">'.$board->nbtodo.'</a></td>';
+  $board->load_board($user);
-      print '<td align="right">';
-      print '<a href="'.DOL_URL_ROOT.'/commande/liste.php">';
-      print $board->nbtodolate;
-      print '</a></td><td nowrap align="right">';
-      print ' (>'.ceil($conf->commande->traitement->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
-      print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
-      print '</td>';
-      print '</tr>';
-    print "\n";
-    }
 
-  // Nbre propales ouvertes (expirées)
+  $var=!$var;
-  if ($conf->propal->enabled && $user->rights->propale->lire)
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("TransactionsToConciliate"),"payment").'</td><td>'.$langs->trans("TransactionsToConciliate").'</td>';
-    {
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank">'.$board->nbtodo.'</a></td>';
-      $langs->load("propal");
+  print '<td align="right">';
-      
+  print '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank">';
-      include_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+  print $board->nbtodolate;
-      $board=new Propal($db);
+  print '</a></td><td nowrap align="right">';
-      $board->load_board($user,"opened");
+  print ' (>'.ceil($conf->bank->rappro->warning_delay/60/60/24).' '.$langs->trans("days").')';
-
+  print '</td>';
-      $var=!$var;
+  print '<td>';
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Propals"),"propal").'</td><td>'.$langs->trans("PropalsToClose").'</td>';
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal.php?viewstatut=1">'.$board->nbtodo.'</a></td>';
+  else print '&nbsp;';
-      print '<td align="right">';
+  print '</td>';
-      print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?viewstatut=1">';
+  print '</tr>';
-      print $board->nbtodolate;
+print "\n";
-      print '</a></td><td nowrap align="right">';
+}
-      print ' (>'.ceil($conf->propal->cloture->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
-      print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
-      print '</td>';
-      print '</tr>';
-    }
-
-  // Nbre propales fermées signées (à facturer)
-  if ($conf->propal->enabled && $user->rights->propale->lire)
-    {
-      $langs->load("propal");
-
-      include_once(DOL_DOCUMENT_ROOT."/propal.class.php");
-      $board=new Propal($db);
-      $board->load_board($user,"signed");
-
-      $var=!$var;
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Propals"),"propal").'</td><td>'.$langs->trans("PropalsToBill").'</td>';
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal.php?viewstatut=2">'.$board->nbtodo.'</a></td>';
-      print '<td align="right">';
-      print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?viewstatut=2">';
-      print $board->nbtodolate;
-      print '</a></td><td nowrap align="right">';
-      print ' (>'.ceil($conf->propal->facturation->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
-      print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
-      print '</td>';
-      print '</tr>';
-    print "\n";
-    }
-
-  // Nbre services à activer (en retard)
-  if ($conf->contrat->enabled && $user->rights->contrat->lire)
-    {
-      $langs->load("contracts");
-    
-      include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
-      $board=new Contrat($db);
-      $board->load_board($user,"inactives");
-
-      $var=!$var;
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Contract"),"contract").'</td><td>'.$langs->trans("BoardNotActivatedServices").'</td>';
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=0">'.$board->nbtodo.'</a></td>';
-      print '<td align="right">';
-      print '<a href="'.DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=0">';
-      print $board->nbtodolate;
-      print '</a></td><td nowrap align="right">';
-      print ' (>'.ceil($conf->contrat->services->inactifs->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
-      print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
-      print '</td>';
-      print '</tr>';
-    print "\n";
-    }
-
-  // Nbre services actifs (à renouveler)
-  if ($conf->contrat->enabled && $user->rights->contrat->lire)
-    {
-      $langs->load("contracts");
-
-      include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
-      $board=new Contrat($db);
-      $board->load_board($user,"expired");
-
-      $var=!$var;
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Contract"),"contract").'</td><td>'.$langs->trans("BoardRunningServices").'</td>';
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=4">'.$board->nbtodo.'</a></td>';
-      print '<td align="right">';
-      print '<a href="'.DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=4">';
-      print $board->nbtodolate;
-      print '</a></td><td nowrap align="right">';
-      print ' (>'.ceil($conf->contrat->services->expires->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
-      print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
-      print '</td>';
-      print '</tr>';
-    print "\n";
-    }
-
-  // Nbre factures fournisseurs (à payer)
-  if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->facture->lire)
-    {
-      $langs->load("bills");
-    
-      include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php");
-      $board=new FactureFournisseur($db);
-      $board->load_board($user);
-
-      $var=!$var;
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Bills"),"bill").'</td><td>'.$langs->trans("SupplierBillsToPay").'</td>';
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/fourn/facture/index.php?filtre=paye:0">'.$board->nbtodo.'</a></td>';
-      print '<td align="right">';
-      print '<a href="'.DOL_URL_ROOT.'/fourn/facture/index.php?filtre=paye:0">';
-      print $board->nbtodolate;
-      print '</a></td><td nowrap align="right">';
-      print ' (>'.ceil($conf->facture->fournisseur->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
-      print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
-      print '</td>';
-      print '</tr>';
-    print "\n";
-    }
-
-  // Nbre factures clients (à payer)
-  if ($conf->facture->enabled && $user->rights->facture->lire)
-    {
-      $langs->load("bills");
-      
-      include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-      $board=new Facture($db);
-      $board->load_board($user);
-
-      $var=!$var;
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Bills"),"bill").'</td><td>'.$langs->trans("CustomerBillsUnpayed").'</td>';
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/impayees.php">'.$board->nbtodo.'</a></td>';
-      print '<td align="right">';
-      print '<a href="'.DOL_URL_ROOT.'/compta/facture/impayees.php">';
-      print $board->nbtodolate;
-      print '</a></td><td nowrap align="right">';
-      print ' (>'.ceil($conf->facture->client->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
-      print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
-      print '</td>';
-      print '</tr>';
-    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");
+  $langs->load("banks");
 
-      include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php");
+  include_once(DOL_DOCUMENT_ROOT."/compta/paiement/cheque/remisecheque.class.php");
-      $board=new Account($db);
+  $board=new RemiseCheque($db);
-      $board->load_board($user);
+  $board->load_board($user);
 
-      $var=!$var;
+  $var=!$var;
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("TransactionsToConciliate"),"payment").'</td><td>'.$langs->trans("TransactionsToConciliate").'</td>';
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("BankChecksToReceipt"),"payment").'</td><td>'.$langs->trans("BankChecksToReceipt").'</td>';
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank">'.$board->nbtodo.'</a></td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=accountancy">'.$board->nbtodo.'</a></td>';
-      print '<td align="right">';
+  print '<td align="right">';
-      print '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank">';
+  print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=accountancy">';
-      print $board->nbtodolate;
+  print $board->nbtodolate;
-      print '</a></td><td nowrap align="right">';
+  print '</a></td><td nowrap align="right">';
-      print ' (>'.ceil($conf->bank->rappro->warning_delay/60/60/24).' '.$langs->trans("days").')';
+  print ' (>'.ceil($conf->bank->cheque->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
+  print '</td>';
-      print '<td>';
+  print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
+  else print '&nbsp;';
-      print '</td>';
+  print '</td>';
-      print '</tr>';
+  print '</tr>';
-    print "\n";
+print "\n";
-    }
-
-	  // Nbre ecritures à rapprocher
-  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");
-      $board=new RemiseCheque($db);
-      $board->load_board($user);
-
-      $var=!$var;
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("BankChecksToReceipt"),"payment").'</td><td>'.$langs->trans("BankChecksToReceipt").'</td>';
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=accountancy">'.$board->nbtodo.'</a></td>';
-      print '<td align="right">';
-      print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=accountancy">';
-      print $board->nbtodolate;
-      print '</a></td><td nowrap align="right">';
-      print ' (>'.ceil($conf->bank->cheque->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
-      print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
-      print '</td>';
-      print '</tr>';
-    print "\n";
-    }
-	
-  // Nbre adhérent valides (attente cotisation)
-  if ($conf->adherent->enabled && $user->rights->adherent->lire && ! $user->societe_id)
-    {
-      $langs->load("members");
-
-      include_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
-      $board=new Adherent($db);
-      $board->load_board($user);
-
-      $var=!$var;
-      print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Members"),"user").'</td><td>'.$langs->trans("Members").'</td>';
-      print '<td align="right"><a href="'.DOL_URL_ROOT.'/adherents/liste.php?mainmenu=members&statut=1">'.$board->nbtodo.'</a></td>';
-      print '<td align="right">';
-      print '<a href="'.DOL_URL_ROOT.'/adherents/liste.php?mainmenu=members&statut=1">';
-      print $board->nbtodolate;
-      print '</a></td><td nowrap align="right">';
-      print ' (>'.ceil($conf->adherent->cotisation->warning_delay/60/60/24).' '.$langs->trans("days").')';
-      print '</td>';
-      print '<td>';
-      if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
-      else print '&nbsp;';
-      print '</td>';
-      print '</tr>';
-    print "\n";
-    }
-
-  print '</table>';
 }
 
+// Nbre adhérent valides (attente cotisation)
+if ($conf->adherent->enabled && $user->rights->adherent->lire && ! $user->societe_id)
+{
+  $langs->load("members");
+
+  include_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
+  $board=new Adherent($db);
+  $board->load_board($user);
+
+  $var=!$var;
+  print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Members"),"user").'</td><td>'.$langs->trans("Members").'</td>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/adherents/liste.php?mainmenu=members&statut=1">'.$board->nbtodo.'</a></td>';
+  print '<td align="right">';
+  print '<a href="'.DOL_URL_ROOT.'/adherents/liste.php?mainmenu=members&statut=1">';
+  print $board->nbtodolate;
+  print '</a></td><td nowrap align="right">';
+  print ' (>'.ceil($conf->adherent->cotisation->warning_delay/60/60/24).' '.$langs->trans("days").')';
+  print '</td>';
+  print '<td>';
+  if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning");
+  else print '&nbsp;';
+  print '</td>';
+  print '</tr>';
+print "\n";
+}
+
+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">';