';
@@ -116,6 +122,8 @@ else
$filelib=eregi_replace('\.php$','',MAIN_MENU_BARRETOP);
print $filelib;
print '';
+ print '
| Afficher zone de recherche Contacts dans le menu gauche | ' . (MAIN_SEARCHFORM_CONTACT?"oui":"non") . ' |
';
+ print '
| Afficher zone de recherche Sociétés dans le menu gauche | ' . (MAIN_SEARCHFORM_SOCIETE?"oui":"non") . ' |
';
print '
';
print '
';
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index d604fc2f578..15216e402d3 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -41,7 +41,8 @@ class DolibarrModules
Function _init($array_sql)
{
/*
- * Activation du module
+ * Activation du module:
+ * Insère les constantes dans llx_const
*/
$err = 0;
@@ -53,6 +54,7 @@ class DolibarrModules
$err++;
}
+ // Ajout des boxes dans llx_boxes_def
foreach ($this->boxes as $key => $value)
{
$titre = $this->boxes[$key][0];
@@ -80,10 +82,11 @@ class DolibarrModules
foreach ($this->const as $key => $value)
{
- $name = $this->const[$key][0];
- $type = $this->const[$key][1];
- $val = $this->const[$key][2];
- $note = $this->const[$key][3];
+ $name = $this->const[$key][0];
+ $type = $this->const[$key][1];
+ $val = $this->const[$key][2];
+ $note = $this->const[$key][3];
+ $visible= $this->const[$key][4]||'0';
$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."const WHERE name ='".$name."'";
@@ -93,21 +96,22 @@ class DolibarrModules
if ($row[0] == 0)
{
- if (strlen($note)){
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note) VALUES ('".$name."','".$type."','".$val."','$note')";
- }elseif (strlen($val))
- {
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value) VALUES ('".$name."','".$type."','".$val."')";
- }
- else
- {
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type) VALUES ('".$name."','".$type."')";
- }
-
- if (! $this->db->query($sql) )
- {
- $err++;
- }
+ // Si non trouve
+ if (strlen($note)){
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible) VALUES ('$name','$type','$val','$note','$visible')";
+ }elseif (strlen($val))
+ {
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,visible) VALUES ('$name','$type','$val','$visible')";
+ }
+ else
+ {
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,visible) VALUES ('$name','$type','$visible')";
+ }
+
+ if (! $this->db->query($sql) )
+ {
+ $err++;
+ }
}
}
else
diff --git a/htdocs/includes/modules/modDon.class.php b/htdocs/includes/modules/modDon.class.php
index 8f723d45a5f..38efe792e5b 100644
--- a/htdocs/includes/modules/modDon.class.php
+++ b/htdocs/includes/modules/modDon.class.php
@@ -41,6 +41,15 @@ class modDon extends DolibarrModules
$this->const = array();
$this->boxes = array();
+
+ /*
+ * Constantes
+ */
+ $this->const[0][0] = "DONS_FORM";
+ $this->const[0][1] = "chaine";
+ $this->const[0][2] = "fsfe.fr.php";
+ $this->const[0][3] = 'Nom du gestionnaire de formulaire de dons';
+ $this->const[0][4] = 1;
}
/*
*
diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php
index 4b1bdf81b2a..1c346c69cda 100644
--- a/htdocs/includes/modules/modPropale.class.php
+++ b/htdocs/includes/modules/modPropale.class.php
@@ -44,16 +44,22 @@ class modPropale extends DolibarrModules
$this->const = array();
$this->boxes = array();
+
/*
* Constantes
*/
$this->const[0][0] = "PROPALE_ADDON_PDF";
$this->const[0][1] = "chaine";
$this->const[0][2] = "rouge";
+ $this->const[0][3] = 'Nom du gestionnaire de génération des propales en PDF';
+ $this->const[0][4] = 0;
$this->const[1][0] = "PROPALE_ADDON";
$this->const[1][1] = "chaine";
$this->const[1][2] = "mod_propale_ivoire";
+ $this->const[1][3] = 'Nom du gestionnaire de numérotation des propales';
+ $this->const[1][4] = 0;
+
/*
* Boites
*/
diff --git a/mysql/data/data.sql b/mysql/data/data.sql
index fd7e29fc5a0..592d3f69b54 100644
--- a/mysql/data/data.sql
+++ b/mysql/data/data.sql
@@ -56,15 +56,15 @@ delete from llx_boxes;
insert into llx_const (name, value, type, note) values ('MAIN_MONNAIE','euros','chaine','Monnaie');
insert into llx_const (name, value, type, note) values ('MAIN_UPLOAD_DOC','1','chaine','Authorise l\'upload de document');
insert into llx_const (name, value, type, note) values ('MAIN_NOT_INSTALLED','1','chaine','Test d\'installation');
-insert into llx_const (name, value, type, note) values ('MAIN_MAIL_FROM','adherents@domain.com','chaine','From des mails');
+insert into llx_const (name, value, type, note) values ('MAIN_MAIL_FROM','dolibarr-robot@domain.com','chaine','EMail emetteur pour les notifications automatiques Dolibarr');
insert into llx_const (name, value, type, note) values ('MAIN_START_YEAR','2003','chaine','Année de départ');
insert into llx_const (name, value, type, note) values ('MAIN_TITLE','Dolibarr','chaine','Titre des pages');
insert into llx_const (name, value, type, note) values ('MAIN_DEBUG','1','yesno','Debug ..');
-insert into llx_const (name, value, type, note) values ('MAIN_SEARCHFORM_SOCIETE','1','yesno','Affichage du formulaire de recherche des sociétés dans la barre de gauche');
-insert into llx_const (name, value, type, note) values ('MAIN_SEARCHFORM_CONTACT','1','yesno','Affichage du formulaire de recherche des contacts dans la barre de gauche');
+insert into llx_const (name, value, type, note, visible) values ('MAIN_SEARCHFORM_CONTACT','1','yesno','Affichage formulaire de recherche des Contacts dans la barre de gauche',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_SEARCHFORM_SOCIETE','1','yesno','Affichage formulaire de recherche des Sociétés dans la barre de gauche',0);
insert into llx_const (name, value, type, note, visible) values ('COMPTA_BANK_FACTURES','1','yesno','Menu factures dans la partie bank',0);
insert into llx_const (name, value, type, note, visible) values ('COMPTA_ONLINE_PAYMENT_BPLC','1','yesno','Système de gestion de la banque populaire de Lorraine',0);
diff --git a/mysql/migration/1.1.0-1.2.0-RC1.sql b/mysql/migration/1.1.0-1.2.0-RC1.sql
index 0b53459acb2..bdec7823d33 100644
--- a/mysql/migration/1.1.0-1.2.0-RC1.sql
+++ b/mysql/migration/1.1.0-1.2.0-RC1.sql
@@ -181,6 +181,7 @@ create table llx_paiementcharge
update llx_const set visible=0 where name like 'ADHERENT%';
+update llx_const set visible=0 where name like 'PROPALE_ADDON%';
drop table llx_c_pays;
diff --git a/mysql/mysql.sql b/mysql/mysql.sql
index 1058bbb0c8c..67cb954f48b 100644
--- a/mysql/mysql.sql
+++ b/mysql/mysql.sql
@@ -1298,9 +1298,9 @@ insert into llx_const(name, value, type, note, visible) values ('ADHERENT_CARD_T
INSERT INTO llx_const(name, value, type) VALUES ('DB_NAME_OSC','catalog','chaine');
INSERT INTO llx_const(name, value, type) VALUES ('OSC_LANGUAGE_ID','1','chaine');
INSERT INTO llx_const(name, value, type) VALUES ('OSC_CATALOG_URL','http://osc.lafrere.lan/','chaine');
-INSERT INTO llx_const (name, value, type, note) VALUES ('MAIN_MAIL_FROM','adherents@domain.com','chaine','From des mails');
+INSERT INTO llx_const (name, value, type, note) VALUES ('MAIN_MAIL_FROM','dolibarr-robot@domain.com','chaine','EMail emetteur pour les notifications automatiques Dolibarr');
INSERT INTO llx_const (name, value, type, note) VALUES ('ADHERENT_MAIL_FROM','adherents@domain.com','chaine','From des mails adherents');
-INSERT INTO llx_const (name, value, type, note) VALUES ('MAIN_MENU_BARRETOP','default.php','chaine','Module commande');
+INSERT INTO llx_const (name, value, type, note) VALUES ('MAIN_MENU_BARRETOP','default.php','chaine','Module de gestion de la barre de menu du haut');
delete from llx_c_chargesociales;