From 40e0347bb5cbbf55f448f300ed2321d95b8bfcd4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 26 Mar 2016 12:26:27 +0100 Subject: [PATCH] More complete dependencies --- htdocs/core/boxes/box_graph_product_distribution.php | 4 +--- htdocs/core/class/infobox.class.php | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php index 2efe5eec438..46ddccc2a1d 100644 --- a/htdocs/core/boxes/box_graph_product_distribution.php +++ b/htdocs/core/boxes/box_graph_product_distribution.php @@ -31,11 +31,10 @@ class box_graph_product_distribution extends ModeleBoxes var $boxcode="productdistribution"; var $boximg="object_product"; var $boxlabel="BoxProductDistribution"; - var $depends = array("product|service"); + var $depends = array("product|service","facture|propal|commande"); var $db; var $param; - var $enabled=1; var $info_box_head = array(); var $info_box_contents = array(); @@ -52,7 +51,6 @@ class box_graph_product_distribution extends ModeleBoxes global $conf; $this->db=$db; - $this->enabled=($conf->facture->enabled || $conf->propal->enabled || $conf->commande->enabled); } /** diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php index 755e304abfd..cd06eb587b7 100644 --- a/htdocs/core/class/infobox.class.php +++ b/htdocs/core/class/infobox.class.php @@ -72,7 +72,7 @@ class InfoBox $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d"; $sql.= " WHERE d.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")"; } - + dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')."", LOG_DEBUG); $resql = $db->query($sql); if ($resql) @@ -145,7 +145,7 @@ class InfoBox if (! empty($conf->$tmpmodule->enabled)) $tmpenabled=1; //print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'
'; } - if (empty($tmpenabled)) // We found at least one module required that disabled + if (empty($tmpenabled)) // We found at least one module required that is disabled { $enabled=0; break;