Fix: current entity by default

Todo: some constant already defined in module ?

htdocs/includes/modules/DolibarrModules.class.php

@@ -759,8 +759,7 @@ class DolibarrModules
 			$val    = $this->const[$key][2];
 			$note   = $this->const[$key][3];
 			$visible= $this->const[$key][4];
-			$entity = isset($this->const[$key][5])?$this->const[$key][5]:0;
-			$entity = ((!empty($entity) || $entity == '0')?$entity:$conf->entity);
+			$entity = isset($this->const[$key][5])?$this->const[$key][5]:$conf->entity;
 
 			$sql = "SELECT count(*)";
 			$sql.= " FROM ".MAIN_DB_PREFIX."const";

htdocs/includes/modules/modProduit.class.php

@@ -85,6 +85,7 @@ class modProduit extends DolibarrModules
 		$this->const[$r][2] = "1";
 		$this->const[$r][3] = "Affichage formulaire de recherche des Produits et Services dans la barre de gauche";
 		$this->const[$r][4] = 0;
+		$this->const[$r][5] = 0;
 		$r++;
 
 		// Boxes

htdocs/includes/modules/modPropale.class.php

@@ -34,7 +34,8 @@
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
 
-/** \class 		modPropale
+/** 
+ *  \class 		modPropale
  *	\brief      Classe de description et activation du module Propale
  */
 class modPropale extends DolibarrModules

htdocs/includes/modules/modSociete.class.php

@@ -91,6 +91,7 @@ class modSociete extends DolibarrModules
 		$this->const[$r][2] = "1";
 		$this->const[$r][3] = "Affichage formulaire de recherche des Societes dans la barre de gauche";
 		$this->const[$r][4] = 0;
+		$this->const[$r][5] = 0;
 		$r++;
 
 		$this->const[$r][0] = "MAIN_SEARCHFORM_CONTACT";
@@ -98,6 +99,7 @@ class modSociete extends DolibarrModules
 		$this->const[$r][2] = "1";
 		$this->const[$r][3] = "Affichage formulaire de recherche des Contacts dans la barre de gauche";
 		$this->const[$r][4] = 0;
+		$this->const[$r][5] = 0;
 		$r++;
 
 		// Boxes

htdocs/install/mysql/data/llx_const.sql

@@ -47,6 +47,7 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_M
 
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_UPLOAD_DOC','2048','chaine','Max size for file upload (0 means no upload allowed)',0,0);
 
+-- TODO deja initialise dans le module ?
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SEARCHFORM_SOCIETE','1','yesno','Show form for quick company search',0,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SEARCHFORM_CONTACT','1','yesno','Show form for quick contact search',0,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SEARCHFORM_PRODUITSERVICE' ,'1','yesno','Show form for quick product search',0,0);