diff --git a/htdocs/main.inc.php3 b/htdocs/main.inc.php3 index 90869285f43..7ea21920cc3 100644 --- a/htdocs/main.inc.php3 +++ b/htdocs/main.inc.php3 @@ -135,15 +135,12 @@ if (defined("MAIN_MODULE_FACTURE") && MAIN_MODULE_FACTURE) require (DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); if (defined("FACTURE_ADDON")) - { - if (is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/facture/".FACTURE_ADDON."/".FACTURE_ADDON.".modules.php")) - require(DOL_DOCUMENT_ROOT ."/includes/modules/facture/".FACTURE_ADDON."/".FACTURE_ADDON.".modules.php"); - } + if (is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/facture/".FACTURE_ADDON."/".FACTURE_ADDON.".modules.php")) + require(DOL_DOCUMENT_ROOT ."/includes/modules/facture/".FACTURE_ADDON."/".FACTURE_ADDON.".modules.php"); if (defined("FACTURE_ADDON_PDF")) - { - 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") && MAIN_MODULE_PROPALE) @@ -151,10 +148,9 @@ if (defined("MAIN_MODULE_PROPALE") && MAIN_MODULE_PROPALE) require (DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); if (defined("PROPALE_ADDON")) - { - require(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON."/".PROPALE_ADDON.".modules.php"); - } - + if (is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON.".php")) + require(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON.".php"); + if (! defined("PROPALE_OUTPUTDIR")) { define('PROPALE_OUTPUTDIR', DOL_DOCUMENT_ROOT . "/document/propale/");