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

Suppression des variables PROPALE_ADDON_PDF et PROPALE_ADDON de la page config autre car elles ont ete places dans la page de configuration du module propale

Browse Source
This commit is contained in:
Laurent Destailleur 2004-06-09 01:30:26 +00:00
parent 18557e677d
commit 68653fd072
7 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/admin/ihm.php
View File

@ -25,11 +25,13 @@ if (!$user->admin)
accessforbidden();
if ($HTTP_POST_VARS["action"] == 'update')
if ($_POST["action"] == 'update')
{
dolibarr_set_const($db, "MAIN_THEME",$HTTP_POST_VARS["main_theme"]);
dolibarr_set_const($db, "SIZE_LISTE_LIMIT",$HTTP_POST_VARS["size_liste_limit"]);
dolibarr_set_const($db, "MAIN_MENU_BARRETOP",$HTTP_POST_VARS["main_menu_barretop"]);
dolibarr_set_const($db, "MAIN_THEME",$_POST["main_theme"]);
dolibarr_set_const($db, "SIZE_LISTE_LIMIT",$_POST["size_liste_limit"]);
dolibarr_set_const($db, "MAIN_MENU_BARRETOP",$_POST["main_menu_barretop"]);
dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT",$_POST["main_searchform_contact"]);
dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE",$_POST["main_searchform_societe"]);
Header("Location: $PHP_SELF");
}
@ -97,6 +99,10 @@ if ($_GET["action"] == 'edit')
print '</select>';
print '</td></tr>';
print '<tr class="pair"><td width="50%">Afficher formulaire de recherche Contacts dans la barre de gauche</td><td><input name="main_searchform_contact" size="20" value="' . MAIN_SEARCHFORM_CONTACT . '"></td></tr>';
print '<tr class="impair"><td width="50%">Afficher formulaire de recherche Sociétés dans la barre de gauche</td><td><input name="main_searchform_societe" size="20" value="' . MAIN_SEARCHFORM_SOCIETE . '"></td></tr>';
print '</table><br>';
print '<div class="tabsAction">';
@ -116,6 +122,8 @@ else
$filelib=eregi_replace('\.php$','',MAIN_MENU_BARRETOP);
print $filelib;
print '</td></tr>';
print '<tr class="pair"><td>Afficher zone de recherche Contacts dans le menu gauche</td><td>' . (MAIN_SEARCHFORM_CONTACT?"oui":"non") . '</td></tr>';
print '<tr class="impair"><td>Afficher zone de recherche Sociétés dans le menu gauche</td><td>' . (MAIN_SEARCHFORM_SOCIETE?"oui":"non") . '</td></tr>';
print '</table><br>';
print '<div class="tabsAction">';

44
htdocs/includes/modules/DolibarrModules.class.php
View File

@ -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

9
htdocs/includes/modules/modDon.class.php
View File

@ -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;
}
/*
*

6
htdocs/includes/modules/modPropale.class.php
View File

@ -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
*/

6
mysql/data/data.sql
View File

@ -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);

1
mysql/migration/1.1.0-1.2.0-RC1.sql
View File

@ -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;

4
mysql/mysql.sql
View File

@ -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;