lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Box for order was lost.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-03-20 17:10:02 +00:00
parent f54de2174e
commit fcbeccddc5
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/boxes.php
View File

@ -142,7 +142,7 @@ class InfoBox
{ {
foreach($box->depends as $module) foreach($box->depends as $module)
{ {
// print $module.'<br>'; //print $boxname.'-'.$module.'<br>';
if (empty($conf->$module->enabled)) $enabled=false; if (empty($conf->$module->enabled)) $enabled=false;
} }
} }

4
htdocs/core/conf.class.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Xavier Dutoit <doli@sydesy.com> * Copyright (C) 2003 Xavier Dutoit <doli@sydesy.com>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Jean Heimburger <jean@tiaris.info> * Copyright (C) 2006 Jean Heimburger <jean@tiaris.info>
* *
@ -145,7 +145,7 @@ class Conf
$this->compta->enabled=defined("MAIN_MODULE_COMPTABILITE")?MAIN_MODULE_COMPTABILITE:0; $this->compta->enabled=defined("MAIN_MODULE_COMPTABILITE")?MAIN_MODULE_COMPTABILITE:0;
$this->webcal->enabled=defined('MAIN_MODULE_WEBCALENDAR')?MAIN_MODULE_WEBCALENDAR:0; $this->webcal->enabled=defined('MAIN_MODULE_WEBCALENDAR')?MAIN_MODULE_WEBCALENDAR:0;
$this->propal->enabled=defined("MAIN_MODULE_PROPALE")?MAIN_MODULE_PROPALE:0; $this->propal->enabled=defined("MAIN_MODULE_PROPALE")?MAIN_MODULE_PROPALE:0;
// Module agenda // Module agenda
$this->agenda->dir_temp=DOL_DATA_ROOT."/agenda/temp"; $this->agenda->dir_temp=DOL_DATA_ROOT."/agenda/temp";

14
htdocs/includes/boxes/box_commandes.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -19,11 +19,11 @@
*/ */
/** /**
\file htdocs/includes/boxes/box_commandes.php * \file htdocs/includes/boxes/box_commandes.php
\ingroup commande * \ingroup commande
\brief Module de generation de l'affichage de la box commandes * \brief Module de generation de l'affichage de la box commandes
\version $Id$ * \version $Id$
*/ */
include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
@ -33,7 +33,7 @@ class box_commandes extends ModeleBoxes {
var $boxcode="lastcustomerorders"; var $boxcode="lastcustomerorders";
var $boximg="object_order"; var $boximg="object_order";
var $boxlabel; var $boxlabel;
var $depends = array("commandes"); var $depends = array("commande");
var $db; var $db;
var $param; var $param;

4
htdocs/includes/modules/modCommande.class.php
View File

@ -43,7 +43,7 @@ class modCommande extends DolibarrModules
/** /**
* \brief Constructeur. Definit les noms, constantes et boites * \brief Constructeur. Definit les noms, constantes et boites
* \param DB handler d'acc<EFBFBD>s base * \param DB Database handler
*/ */
function modCommande($DB) function modCommande($DB)
{ {
@ -67,7 +67,7 @@ class modCommande extends DolibarrModules
// Config pages // Config pages
$this->config_page_url = array("commande.php"); $this->config_page_url = array("commande.php");
// D<EFBFBD>pendances // Dependancies
$this->depends = array("modCommercial"); $this->depends = array("modCommercial");
$this->requiredby = array("modExpedition"); $this->requiredby = array("modExpedition");
$this->conflictwith = array(); $this->conflictwith = array();

18
htdocs/includes/modules/modCommercial.class.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* *
@ -20,9 +20,9 @@
*/ */
/** \defgroup commercial Module commercial /** \defgroup commercial Module commercial
\brief Module pour gerer les fonctions commerciales * \brief Module pour gerer les fonctions commerciales
\version $Id$ * \version $Id$
*/ */
/** /**
\file htdocs/includes/modules/modCommercial.class.php \file htdocs/includes/modules/modCommercial.class.php
@ -33,16 +33,16 @@
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** \class modCommercial /** \class modCommercial
\brief Classe de description et activation du module Commercial * \brief Classe de description et activation du module Commercial
*/ */
class modCommercial extends DolibarrModules class modCommercial extends DolibarrModules
{ {
/** /**
* \brief Constructeur. Definit les noms, constantes et boites * \brief Constructeur. Definit les noms, constantes et boites
* \param DB handler d'acc<EFBFBD>s base * \param DB Database handler
*/ */
function modCommercial($DB) function modCommercial($DB)
{ {
@ -64,7 +64,7 @@ class modCommercial extends DolibarrModules
// Dir // Dir
$this->dirs = array(); $this->dirs = array();
// D<EFBFBD>pendances // Dependancies
$this->depends = array("modSociete"); $this->depends = array("modSociete");
$this->requiredby = array("modPropale","modContrat","modCommande","modFicheinter"); $this->requiredby = array("modPropale","modContrat","modCommande","modFicheinter");