diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/includes/boxes/box_propales.php index 0186c7162a8..37aa40f8e97 100644 --- a/htdocs/includes/boxes/box_propales.php +++ b/htdocs/includes/boxes/box_propales.php @@ -33,7 +33,7 @@ class box_propales extends ModeleBoxes { var $boxcode="lastpropals"; var $boximg="object_propal"; var $boxlabel; - var $depends = array("propale"); + var $depends = array("propal"); // conf->propal->enabled var $db; var $param; diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php index 15eb512a747..e3873c70b8b 100644 --- a/htdocs/includes/modules/modPropale.class.php +++ b/htdocs/includes/modules/modPropale.class.php @@ -17,27 +17,25 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \defgroup propale Module propale - \brief Module pour gerer la tenue de propositions commerciales + * \brief Module pour gerer la tenue de propositions commerciales */ /** - \file htdocs/includes/modules/modPropale.class.php - \ingroup propale - \brief Fichier de description et activation du module Propale + * \file htdocs/includes/modules/modPropale.class.php + * \ingroup propale + * \brief Fichier de description et activation du module Propale + * \version $Id$ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); -/** \class modPropale - \brief Classe de description et activation du module Propale +/** \class modPropale + * \brief Classe de description et activation du module Propale */ - class modPropale extends DolibarrModules { diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index ce5c249f641..fac6c67d933 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -35,9 +35,9 @@ $langs->load("other"); $demoprofiles=array( array('default'=>'-1', 'key'=>'profdemofun','label'=>'DemoFundation', - 'disablemodules'=>'banque,barcode,bookmark,boutique,cashdesk,commande,commercial,comptabilite,contrat,expedition,facture,fournisseur,prelevement,produit,projet,propal,service,societe,stock,tax'), + 'disablemodules'=>'banque,barcode,bookmark,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,facture,fournisseur,prelevement,produit,projet,propal,propale,service,societe,stock,tax'), array('default'=>'0', 'key'=>'profdemofun2','label'=>'DemoFundation2', - 'disablemodules'=>'barcode,boutique,bookmark,cashdesk,commande,commercial,contrat,expedition,facture,fournisseur,prelevement,produit,projet,propal,service,societe,stock'), + 'disablemodules'=>'barcode,boutique,bookmark,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,facture,fournisseur,prelevement,produit,projet,propal,propale,service,societe,stock'), array('default'=>'1', 'key'=>'profdemoservonly','label'=>'DemoCompanyServiceOnly', 'disablemodules'=>'adherent,barcode,boutique,bookmark,cashdesk,don,expedition,prelevement,projet,stock'), array('default'=>'-1','key'=>'profdemoshopwithdesk','label'=>'DemoCompanyShopWithCashDesk',