From a477c5cab758cac55b5ff47ccd60868a9ac3c0b9 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 6 May 2009 15:25:32 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20seul=20le=20superadmin=20peut=20changer?= =?UTF-8?q?=20la=20config=20de=20l'envoi=20de=20mail=20Fix:=20le=20mail=20?= =?UTF-8?q?=E9metteur=20pour=20l'envoi=20auto=20peut=20varier=20d'une=20en?= =?UTF-8?q?tit=E9=20=E0=20l'autre=20Fix:=20le=20MAIN=5FMONNAIE=20peut=20va?= =?UTF-8?q?rier=20d'une=20entit=E9=20=E0=20l'autre=20Fix:=20une=20entit=E9?= =?UTF-8?q?=20doit=20avoir=20un=20fichier=20de=20log=20diff=E9rent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/admin/mails.php | 2 +- mysql/data/data.sql | 8 ++++---- mysql/migration/2.6.0-2.7.0.sql | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 0940ebff58f..d22bbf8159c 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -332,7 +332,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') { $htmltext = $langs->trans("ContactSuperAdminForChange"); print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext,1,'superadmin'); - rint ''; + print ''; } print ''; } diff --git a/mysql/data/data.sql b/mysql/data/data.sql index fc068b1f7d4..e60360768db 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -60,15 +60,15 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_N insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_FEATURES_LEVEL','0','chaine','Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development',1,0); -- Hidden in misc page -insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0,0); +insert into llx_const (name, value, type, note, visible) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0); insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_POPUP_CALENDAR','eldy','chaine','Popup calendar module',0,0); -insert into llx_const (name, value, type, note, visible, entity) values ('SYSLOG_FILE','DOL_DATA_ROOT/dolibarr.log','chaine','Directory where to write log file',0,0); -insert into llx_const (name, value, type, note, visible, entity) values ('SYSLOG_LEVEL','6','chaine','Level of debug info to show',0,0); +insert into llx_const (name, value, type, note, visible) values ('SYSLOG_FILE','DOL_DATA_ROOT/dolibarr.log','chaine','Directory where to write log file',0); +insert into llx_const (name, value, type, note, visible) values ('SYSLOG_LEVEL','6','chaine','Level of debug info to show',0); insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0,0); insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_PORT','','chaine','Port for SMTP server',0,0); -insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','dolibarr-robot@domain.com','chaine','EMail emetteur pour les emails automatiques Dolibarr',0,0); +insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_EMAIL_FROM','dolibarr-robot@domain.com','chaine','EMail emetteur pour les emails automatiques Dolibarr',0); 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); diff --git a/mysql/migration/2.6.0-2.7.0.sql b/mysql/migration/2.6.0-2.7.0.sql index c04d6922a7b..4360d7595ca 100644 --- a/mysql/migration/2.6.0-2.7.0.sql +++ b/mysql/migration/2.6.0-2.7.0.sql @@ -14,7 +14,7 @@ update llx_menu_constraint set action = '$conf->societe->enabled' where action = -- Clean no more required parameters delete from llx_const where name = 'MAIN_MODULE_COMMERCIAL'; -delete from llx_const where name like 'MAIN_MODULE_%_DIR_OUTPUT'; +delete from llx_const where name like 'MAIN_MODULE_%_DIR_OUTPUT' AND name <> 'MAIN_MODULE_SYSLOG_OUTPUT'; delete from llx_const where name like 'MAIN_MODULE_%_DIR_TEMP'; alter table llx_societe add column import_key varchar(14);