From 03cc21de1fee62d8d025c9d37ca11d7445747c60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 23 Jul 2004 20:00:34 +0000
Subject: [PATCH] =?UTF-8?q?Un=20mauvaise=20initialisation=20de=20la=20prop?=
 =?UTF-8?q?ri=E9t=E9=20enabled,=20rendait=20le=20module=20facture=20toujou?=
 =?UTF-8?q?rs=20actif=20quelquesoit=20le=20choix=20dans=20la=20config=20de?=
 =?UTF-8?q?s=20modules.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/pre.inc.php                   | 24 ++++++++++-----------
 htdocs/conf/conf.class.php                  |  5 ++---
 htdocs/includes/menus/barre_top/default.php |  4 ++--
 htdocs/main.inc.php                         |  6 ++++--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php
index 66d3b96e98f..7d3d1c83bc4 100644
--- a/htdocs/compta/pre.inc.php
+++ b/htdocs/compta/pre.inc.php
@@ -52,13 +52,17 @@ function llxHeader($head = "", $title="") {
       $menu->add(DOL_URL_ROOT."/compta/dons/","Dons");
     }
 
-  $menu->add(DOL_URL_ROOT."/compta/facture.php","Factures");
-  $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php","Paiements");
-  if (! defined(FACTURE_DISABLE_RECUR) || ! FACTURE_DISABLE_RECUR) {
-    $menu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php","Récurrentes");
-  }
-  $menu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/","Statistiques");
-
+  if ($conf->facture->enabled)
+    {
+      $menu->add(DOL_URL_ROOT."/compta/facture.php","Factures");
+      $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php","Paiements");
+      if (! defined(FACTURE_DISABLE_RECUR) || ! FACTURE_DISABLE_RECUR) {
+        $menu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php","Récurrentes");
+      }
+      $menu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/","Statistiques");
+    }
+   
+    
   // Les dépenses
 
   $menu->add(DOL_URL_ROOT."/fourn/index.php", "Fournisseurs");
@@ -87,11 +91,7 @@ function llxHeader($head = "", $title="") {
 
   $menu->add(DOL_URL_ROOT."/compta/stats/","CA / Résultats");
 
-  if ($user->compta > 0) 
-    {
-
-    } 
-  else 
+  if (! $user->compta) 
     {
       $menu->clear();
       $menu->add(DOL_URL_ROOT."/","Accueil");      
diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php
index 84d4e974cd6..0721aa7f6c6 100644
--- a/htdocs/conf/conf.class.php
+++ b/htdocs/conf/conf.class.php
@@ -123,8 +123,7 @@ class WebcalConf
 {
   Function WebcalConf()
     {
-      $this->enabled = 1;
-
+      $this->enabled = 0;
       $this->url = defined("PHPWEBCALENDAR_URL")?PHPWEBCALENDAR_URL:"";
 
       $this->db = new DbConf();
@@ -143,7 +142,7 @@ class FactureConf
 {
   Function FactureConf()
     {
-      $this->enabled = 1;
+      $this->enabled = 0;
     }
 }
 
diff --git a/htdocs/includes/menus/barre_top/default.php b/htdocs/includes/menus/barre_top/default.php
index 9a4528b0452..e15ef3d6169 100644
--- a/htdocs/includes/menus/barre_top/default.php
+++ b/htdocs/includes/menus/barre_top/default.php
@@ -28,7 +28,7 @@ if ($conf->commercial->enabled)   $nbofentries++;
 if ($conf->adherent->enabled)     $nbofentries++;
 if ($conf->compta->enabled) $nbofentries++; 
 if ($conf->produit->enabled || $conf->service->enabled) $nbofentries++; 
-if ($conf->webcalendar->enabled)   $nbofentries++; 
+if ($conf->webcal->enabled)   $nbofentries++; 
 
 print '<table cellpadding="0" cellspacing="0" width="100%"><tr>';
 
@@ -83,7 +83,7 @@ else
       print '</td>';
     }
     
-    if ($conf->webcalendar->enabled)
+    if ($conf->webcal->enabled)
     {
       $class="";
       if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "webcalendar") { $class="menusel"; }
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index b758d1fc098..8d19ee4df8b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -163,7 +163,7 @@ require (DOL_DOCUMENT_ROOT ."/includes/fpdf/fpdf152/fpdf.php");
 define('FPDF_FONTPATH',DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf152/font/');
 
 /*
- * Definition de toutes les Constantes globales d'environement
+ * Definition de toutes les Constantes globales d'environnement
  *
  */
 $sql = "SELECT name, value FROM ".MAIN_DB_PREFIX."const";
@@ -291,10 +291,11 @@ if (defined("MAIN_MODULE_POSTNUKE"))
 }
 if (defined("MAIN_MODULE_WEBCALENDAR"))
 {
-  $conf->webcalendar->enabled=MAIN_MODULE_WEBCALENDAR;
+  $conf->webcal->enabled=MAIN_MODULE_WEBCALENDAR;
 }
 if (defined("MAIN_MODULE_FACTURE"))
 {
+  $conf->facture->enabled=MAIN_MODULE_FACTURE;
   require (DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
 
   if (defined("FACTURE_ADDON"))
@@ -305,6 +306,7 @@ if (defined("MAIN_MODULE_FACTURE"))
     if (is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/facture/pdf_".FACTURE_ADDON_PDF.".modules.php"))
       require(DOL_DOCUMENT_ROOT ."/includes/modules/facture/pdf_".FACTURE_ADDON_PDF.".modules.php");
 }
+
 if (defined("MAIN_MODULE_PROPALE"))
 {
   $conf->propal->enabled=MAIN_MODULE_PROPALE;