diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 9fd939ac152..ac5a47c99e5 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -142,7 +142,7 @@ class InfoBox { foreach($box->depends as $module) { - // print $module.'
'; + //print $boxname.'-'.$module.'
'; if (empty($conf->$module->enabled)) $enabled=false; } } diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index bef6b1ec391..f1e2428493e 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Xavier Dutoit - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2006 Jean Heimburger * @@ -145,7 +145,7 @@ class Conf $this->compta->enabled=defined("MAIN_MODULE_COMPTABILITE")?MAIN_MODULE_COMPTABILITE:0; $this->webcal->enabled=defined('MAIN_MODULE_WEBCALENDAR')?MAIN_MODULE_WEBCALENDAR:0; $this->propal->enabled=defined("MAIN_MODULE_PROPALE")?MAIN_MODULE_PROPALE:0; - + // Module agenda $this->agenda->dir_temp=DOL_DATA_ROOT."/agenda/temp"; diff --git a/htdocs/includes/boxes/box_commandes.php b/htdocs/includes/boxes/box_commandes.php index 7f80b89e479..719ae73b9c1 100644 --- a/htdocs/includes/boxes/box_commandes.php +++ b/htdocs/includes/boxes/box_commandes.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2007 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -19,11 +19,11 @@ */ /** - \file htdocs/includes/boxes/box_commandes.php - \ingroup commande - \brief Module de generation de l'affichage de la box commandes - \version $Id$ -*/ + * \file htdocs/includes/boxes/box_commandes.php + * \ingroup commande + * \brief Module de generation de l'affichage de la box commandes + * \version $Id$ + */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); @@ -33,7 +33,7 @@ class box_commandes extends ModeleBoxes { var $boxcode="lastcustomerorders"; var $boximg="object_order"; var $boxlabel; - var $depends = array("commandes"); + var $depends = array("commande"); var $db; var $param; diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php index ec6ec90da83..cfcfabea3e1 100644 --- a/htdocs/includes/modules/modCommande.class.php +++ b/htdocs/includes/modules/modCommande.class.php @@ -43,7 +43,7 @@ class modCommande extends DolibarrModules /** * \brief Constructeur. Definit les noms, constantes et boites - * \param DB handler d'acc�s base + * \param DB Database handler */ function modCommande($DB) { @@ -67,7 +67,7 @@ class modCommande extends DolibarrModules // Config pages $this->config_page_url = array("commande.php"); - // D�pendances + // Dependancies $this->depends = array("modCommercial"); $this->requiredby = array("modExpedition"); $this->conflictwith = array(); diff --git a/htdocs/includes/modules/modCommercial.class.php b/htdocs/includes/modules/modCommercial.class.php index 0c46d647168..af79c37ae9f 100644 --- a/htdocs/includes/modules/modCommercial.class.php +++ b/htdocs/includes/modules/modCommercial.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * @@ -20,9 +20,9 @@ */ /** \defgroup commercial Module commercial - \brief Module pour gerer les fonctions commerciales - \version $Id$ -*/ + * \brief Module pour gerer les fonctions commerciales + * \version $Id$ + */ /** \file htdocs/includes/modules/modCommercial.class.php @@ -33,16 +33,16 @@ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); -/** \class modCommercial - \brief Classe de description et activation du module Commercial -*/ +/** \class modCommercial + * \brief Classe de description et activation du module Commercial + */ class modCommercial extends DolibarrModules { /** * \brief Constructeur. Definit les noms, constantes et boites - * \param DB handler d'acc�s base + * \param DB Database handler */ function modCommercial($DB) { @@ -64,7 +64,7 @@ class modCommercial extends DolibarrModules // Dir $this->dirs = array(); - // D�pendances + // Dependancies $this->depends = array("modSociete"); $this->requiredby = array("modPropale","modContrat","modCommande","modFicheinter");