lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Un mauvaise initialisation de la proprit enabled, rendait le module facture toujours actif quelquesoit le choix dans la config des modules.

Browse Source
This commit is contained in:
Laurent Destailleur 2004-07-23 20:00:34 +00:00
parent 2f3a55c02d
commit 03cc21de1f
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/compta/pre.inc.php
View File

@ -52,12 +52,16 @@ function llxHeader($head = "", $title="") {
$menu->add(DOL_URL_ROOT."/compta/dons/","Dons"); $menu->add(DOL_URL_ROOT."/compta/dons/","Dons");
} }
if ($conf->facture->enabled)
{
$menu->add(DOL_URL_ROOT."/compta/facture.php","Factures"); $menu->add(DOL_URL_ROOT."/compta/facture.php","Factures");
$menu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php","Paiements"); $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php","Paiements");
if (! defined(FACTURE_DISABLE_RECUR) || ! FACTURE_DISABLE_RECUR) { 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/fiche-rec.php","Récurrentes");
} }
$menu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/","Statistiques"); $menu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/","Statistiques");
}
// Les dépenses // Les dépenses
@ -87,11 +91,7 @@ function llxHeader($head = "", $title="") {
$menu->add(DOL_URL_ROOT."/compta/stats/","CA / Résultats"); $menu->add(DOL_URL_ROOT."/compta/stats/","CA / Résultats");
if ($user->compta > 0) if (! $user->compta)
{
}
else
{ {
$menu->clear(); $menu->clear();
$menu->add(DOL_URL_ROOT."/","Accueil"); $menu->add(DOL_URL_ROOT."/","Accueil");

5
htdocs/conf/conf.class.php
View File

@ -123,8 +123,7 @@ class WebcalConf
{ {
Function WebcalConf() Function WebcalConf()
{ {
$this->enabled = 1; $this->enabled = 0;
$this->url = defined("PHPWEBCALENDAR_URL")?PHPWEBCALENDAR_URL:""; $this->url = defined("PHPWEBCALENDAR_URL")?PHPWEBCALENDAR_URL:"";
$this->db = new DbConf(); $this->db = new DbConf();
@ -143,7 +142,7 @@ class FactureConf
{ {
Function FactureConf() Function FactureConf()
{ {
$this->enabled = 1; $this->enabled = 0;
} }
} }

4
htdocs/includes/menus/barre_top/default.php
View File

@ -28,7 +28,7 @@ if ($conf->commercial->enabled) $nbofentries++;
if ($conf->adherent->enabled) $nbofentries++; if ($conf->adherent->enabled) $nbofentries++;
if ($conf->compta->enabled) $nbofentries++; if ($conf->compta->enabled) $nbofentries++;
if ($conf->produit->enabled || $conf->service->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>'; print '<table cellpadding="0" cellspacing="0" width="100%"><tr>';
@ -83,7 +83,7 @@ else
print '</td>'; print '</td>';
} }
if ($conf->webcalendar->enabled) if ($conf->webcal->enabled)
{ {
$class=""; $class="";
if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "webcalendar") { $class="menusel"; } if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "webcalendar") { $class="menusel"; }

6
htdocs/main.inc.php
View File

@ -163,7 +163,7 @@ require (DOL_DOCUMENT_ROOT ."/includes/fpdf/fpdf152/fpdf.php");
define('FPDF_FONTPATH',DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf152/font/'); 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"; $sql = "SELECT name, value FROM ".MAIN_DB_PREFIX."const";
@ -291,10 +291,11 @@ if (defined("MAIN_MODULE_POSTNUKE"))
} }
if (defined("MAIN_MODULE_WEBCALENDAR")) if (defined("MAIN_MODULE_WEBCALENDAR"))
{ {
$conf->webcalendar->enabled=MAIN_MODULE_WEBCALENDAR; $conf->webcal->enabled=MAIN_MODULE_WEBCALENDAR;
} }
if (defined("MAIN_MODULE_FACTURE")) if (defined("MAIN_MODULE_FACTURE"))
{ {
$conf->facture->enabled=MAIN_MODULE_FACTURE;
require (DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); require (DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
if (defined("FACTURE_ADDON")) 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")) 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"); require(DOL_DOCUMENT_ROOT ."/includes/modules/facture/pdf_".FACTURE_ADDON_PDF.".modules.php");
} }
if (defined("MAIN_MODULE_PROPALE")) if (defined("MAIN_MODULE_PROPALE"))
{ {
$conf->propal->enabled=MAIN_MODULE_PROPALE; $conf->propal->enabled=MAIN_MODULE_PROPALE;