From 069241452a1659d3c37f76410550ee0f8565940f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 1 Oct 2004 17:42:00 +0000 Subject: [PATCH] =?UTF-8?q?L'activation=20du=20module=20prelevement=20est?= =?UTF-8?q?=20charg=E9=20dans=20l'objet=20$conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/pre.inc.php | 2 +- htdocs/master.inc.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php index 4fcd3b4fe90..585d5caac63 100644 --- a/htdocs/compta/pre.inc.php +++ b/htdocs/compta/pre.inc.php @@ -92,7 +92,7 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/compta/stats/","CA / Résultats"); - if (defined("MAIN_MODULE_PRELEVEMENT") && MAIN_MODULE_PRELEVEMENT) + if ($conf->prelevement->enabled) { $menu->add(DOL_URL_ROOT."/compta/prelevement/","Bon prélèv."); } diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 26e4778c7cb..d8f84fba9f7 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Xavier Dutoit * Copyright (C) 2004 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -238,6 +238,10 @@ if (defined("MAIN_MODULE_TELEPHONIE")) { $conf->telephonie->enabled=MAIN_MODULE_TELEPHONIE; } +if (defined("MAIN_MODULE_PRELEVEMENT")) +{ + $conf->prelevement->enabled=MAIN_MODULE_PRELEVEMENT; +} if (defined("MAIN_MODULE_WEBCALENDAR")) { $conf->webcal->enabled=MAIN_MODULE_WEBCALENDAR; @@ -247,7 +251,6 @@ if (defined("MAIN_MODULE_FACTURE")) $conf->facture->enabled=MAIN_MODULE_FACTURE; require (DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); } - if (defined("MAIN_MODULE_PROPALE")) { $conf->propal->enabled=MAIN_MODULE_PROPALE;