From 426fc2ac081b505bef71c9561919325db4f0372a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 16 Feb 2004 21:02:11 +0000
Subject: [PATCH] =?UTF-8?q?Simple=20changement=20de=20l'ordre=20d'affichag?=
 =?UTF-8?q?e=20des=20entr=E9es=20du=20menu=20de=20gauche.=20D'abord=20ce?=
 =?UTF-8?q?=20qui=20touche=20les=20recettes=20(Entr=E9es=20client,=20dons,?=
 =?UTF-8?q?=20factures=20clients,=20contrats)=20,=20puis=20ce=20qui=20touc?=
 =?UTF-8?q?he=20aux=20d=E9penses=20(Fournisseurs,=20D=E9placements,=20Char?=
 =?UTF-8?q?ges,=20TVA),=20puis=20les=20comptes=20qui=20en=20r=E9sultent=20?=
 =?UTF-8?q?(Banque,=20caisse)=20et=20enfin=20la=20vision=20du=20r=E9sultat?=
 =?UTF-8?q?=20(CA=20/=20Exercice).=20Rien=20de=20changer=20dnas=20le=20men?=
 =?UTF-8?q?u,=20juste=20l'ordre=20pour=20etre=20plus=20"logique".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/pre.inc.php | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php
index 756d5054975..5b072470ede 100644
--- a/htdocs/compta/pre.inc.php
+++ b/htdocs/compta/pre.inc.php
@@ -1,5 +1,6 @@
 <?PHP
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> 
+ * Copyright (C) 2004      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
@@ -32,6 +33,8 @@ function llxHeader($head = "", $title="") {
 
   $menu = new Menu();
 
+  // Les recettes
+
   $menu->add(DOL_URL_ROOT."/compta/clients.php", "Clients");
 
   if ($conf->don->enabled)
@@ -44,16 +47,21 @@ 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 && $conf->propale->enabled) 
+  if ($user->comm > 0 && $conf->commercial->enabled && $conf->propal->enabled) 
     {
       $menu->add(DOL_URL_ROOT."/compta/propal.php","Prop. commerciales");
     }
 
   $menu->add(DOL_URL_ROOT."/contrat/","Contrats");
 
-  $menu->add("stats/","CA / Résultats");
+  // Les dépenses
 
-  $menu->add("bank/","Banques");
+  $menu->add(DOL_URL_ROOT."/fourn/index.php", "Fournisseurs");
+
+  if ($user->societe_id == 0)
+    {
+      $menu->add(DOL_URL_ROOT."/compta/deplacement/", "Déplacement");
+    }
 
   if ($conf->compta->tva && $user->societe_id == 0)
     {
@@ -61,13 +69,19 @@ function llxHeader($head = "", $title="") {
     }
   $menu->add("charges/index.php","Charges");
 
+
+
+  // Vision des recettes-dépenses
+
+  $menu->add("bank/","Banques");
+
   if ($user->societe_id == 0)
     {
       $menu->add(DOL_URL_ROOT."/compta/caisse/index.php","Caisse");
-
-      $menu->add(DOL_URL_ROOT."/fourn/index.php", "Fournisseurs");
     }
 
+  $menu->add("stats/","CA / Résultats");
+
   if ($user->compta > 0) 
     {
 
@@ -78,11 +92,6 @@ function llxHeader($head = "", $title="") {
       $menu->add(DOL_URL_ROOT."/","Accueil");      
     }
 
-  if ($user->societe_id == 0)
-    {
-      $menu->add(DOL_URL_ROOT."/compta/deplacement/", "Déplacement");
-    }
-
   left_menu($menu->liste);
 
 }