From e6be3c26099964c2663758b0d6f7bab62ff3e2da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 12 Feb 2004 02:13:48 +0000
Subject: [PATCH] =?UTF-8?q?Les=20liens=20isol=E9s=20"Banque",=20"Exercices?=
 =?UTF-8?q?"=20et=20"Charges"=20ont=20=E9t=E9=20plac=E9s=20sur=20le=20menu?=
 =?UTF-8?q?=20de=20gauche.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/index.php   | 12 ------------
 htdocs/compta/pre.inc.php |  6 ++++--
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 3436c0393bb..6aec18e1562 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -76,18 +76,6 @@ print '<td colspan="2">Rechercher une facture</td></tr>';
 print "<tr $bc[1]><td>";
 print 'Num. : <input type="text" name="sf_ref">&nbsp;<input type="submit" value="Rechercher" class="flat"></td></tr>';
 print "</table></form>";
-/*
- *
- */
-print '<div class="menus">';
-if ($user->societe_id == 0) 
-{
-  print '<ul>';
-  print '<li><a href="./charges/index.php">Charges</a></li>';
-  print '<li><a href="./resultat/">Résultats</a></li>';
-  print '<li><a href="bank/index.php">Banque</a></li>';
-}
-print '</ul></div><br>';
 
 
 
diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php
index eee0cfed3a2..756d5054975 100644
--- a/htdocs/compta/pre.inc.php
+++ b/htdocs/compta/pre.inc.php
@@ -44,20 +44,22 @@ function llxHeader($head = "", $title="") {
   $menu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php","Récurrentes");
   $menu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/","Statistiques");
 
-  if ($user->comm > 0 && $conf->commercial && MAIN_MODULE_PROPALE) 
+  if ($user->comm > 0 && $conf->commercial && $conf->propale->enabled) 
     {
       $menu->add(DOL_URL_ROOT."/compta/propal.php","Prop. commerciales");
     }
 
   $menu->add(DOL_URL_ROOT."/contrat/","Contrats");
 
+  $menu->add("stats/","CA / Résultats");
 
-  $menu->add("stats/","Chiffre d'affaire");
+  $menu->add("bank/","Banques");
 
   if ($conf->compta->tva && $user->societe_id == 0)
     {
       $menu->add("tva/index.php","TVA");
     }
+  $menu->add("charges/index.php","Charges");
 
   if ($user->societe_id == 0)
     {