From 1c56a2c16cde72cf4f63d42b35e2d7a531780314 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 15 May 2006 13:07:30 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20possibilit=E9=20de=20activer/d=E9sactiv?= =?UTF-8?q?er=20les=20exp=E9ditions=20et=20les=20bon=20de=20livraison,=20r?= =?UTF-8?q?enommage=20de=20MAIN=5FMODULE=5FEXPEDITION=20en=20MAIN=5FSUBMOD?= =?UTF-8?q?ULE=5FEXPEDITION?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/master.inc.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 607bddf5c59..c50c59ddc55 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -220,14 +220,19 @@ $conf->externalrss->enabled=defined("MAIN_MODULE_EXTERNALRSS")?MAIN_MODULE_EXTER $conf->commande->enabled=defined("MAIN_MODULE_COMMANDE")?MAIN_MODULE_COMMANDE:0; $conf->commande->dir_output=DOL_DATA_ROOT."/commande"; $conf->commande->dir_images=DOL_DATA_ROOT."/commande/images"; -// Module expeditions -$conf->expedition->enabled=defined("MAIN_SUBMODULE_EXPEDITION")?MAIN_SUBMODULE_EXPEDITION:0; -$conf->expedition->dir_output=DOL_DATA_ROOT."/expedition"; -$conf->expedition->dir_images=DOL_DATA_ROOT."/expedition/images"; -// Module bon de livraison -$conf->livraison->enabled=defined("MAIN_SUBMODULE_LIVRAISON")?MAIN_SUBMODULE_LIVRAISON:0; -$conf->livraison->dir_output=DOL_DATA_ROOT."/livraison"; -$conf->livraison->dir_images=DOL_DATA_ROOT."/livraison/images"; + +if (defined('MAIN_MODULE_EXPEDITION') && MAIN_MODULE_EXPEDITION) +{ + // Module expeditions + $conf->expedition->enabled=defined("MAIN_SUBMODULE_EXPEDITION")?MAIN_SUBMODULE_EXPEDITION:0; + $conf->expedition->dir_output=DOL_DATA_ROOT."/expedition"; + $conf->expedition->dir_images=DOL_DATA_ROOT."/expedition/images"; + // Module bon de livraison + $conf->livraison->enabled=defined("MAIN_SUBMODULE_LIVRAISON")?MAIN_SUBMODULE_LIVRAISON:0; + $conf->livraison->dir_output=DOL_DATA_ROOT."/livraison"; + $conf->livraison->dir_images=DOL_DATA_ROOT."/livraison/images"; +} + // Module societe $conf->societe->enabled=defined("MAIN_MODULE_SOCIETE")?MAIN_MODULE_SOCIETE:0; $conf->societe->dir_output=DOL_DATA_ROOT."/societe";