diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 7392d0368d2..d6cee2ccde1 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -83,11 +82,11 @@ print ''; print "\n"; print ''; -print ''; +print ''; print ''; $form->select_array('consttype',array('yesno','texte','chaine'),2); print ''; -print ''; +print ''; print ''; print '
'; print "\n"; @@ -139,14 +138,14 @@ if ($result) } else { - print ''; + print ''; print ''; $form->select_array('consttype',array('yesno','texte','chaine'),2); } print ''; // Note - print ''; + print ''; print ''; print '   '; print ''.img_delete().''; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 2f2c18995c8..37b8f5c6225 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -93,49 +93,68 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') $var=true; print ''; - print ''; + print ''; + print ''; + print ''; // Langue par defaut $var=!$var; print ''; + print ''; + print ''; + print ''; // Taille max des listes $var=!$var; - print ''; + print ''; + print ''; + print ''; $var=!$var; print ''; + print ''; + print ''; + print ''; $var=!$var; print ''; + print ''; + print ''; + print ''; // Désactiver javascript $var=!$var; print ''; + print ''; + print ''; + print ''; // Désactiver ajax $var=!$var; print ''; + print ''; + print ''; + print ''; // Confirmation par popup ajax - $var=!$var; - print ''; - + if ($conf->global->MAIN_FEATURES_LEVEL >= 2) + { + $var=!$var; + print ''; + print ''; + print ''; + } + // Désactiver le calendrier popup $var=!$var; print ''; + print ''; + print ''; + print ''; // Activer onglet preview $var=!$var; print ''; + print ''; + print ''; + print ''; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("Parameter").''.$langs->trans("Value").' 
'.$langs->trans("DefaultLanguage").''; $html->select_lang($conf->global->MAIN_LANG_DEFAULT,'main_lang_default',1); - print '
 
'.$langs->trans("DefaultMaxSizeList").'
'.$langs->trans("DefaultMaxSizeList").' 
'.$langs->trans("EnableMultilangInterface").''; print $html->selectyesno('main_multilangs',$conf->global->MAIN_MULTILANGS,1); - print '
 
'.$langs->trans("ShowBugTrackLink").''; print $html->selectyesno('main_show_bugtrack_link',$conf->global->MAIN_SHOW_BUGTRACK_LINK,1); - print '
 
'.$langs->trans("DisableJavascript").''; print $html->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1); - print '
 
'.$langs->trans("DisableAjax").''; print $html->selectyesno('main_disable_ajax',isset($conf->global->MAIN_DISABLE_AJAX)?$conf->global->MAIN_DISABLE_AJAX:1,1); print ' ('.$langs->trans("AutomaticIfJavascriptDisabled").')'; - print '
 
'.$langs->trans("ConfirmAjax").''; - print $html->selectyesno('main_confirm_ajax',isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0,1); - print ' ('.$langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled").')'; - print '
'.$langs->trans("ConfirmAjax").''; + print $html->selectyesno('main_confirm_ajax',isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0,1); + print ' ('.$langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled").')'; + print ''.$html->textwithhelp('',$langs->trans("FeatureDevelopment")).'
'.$langs->trans("UsePopupCalendar").''; @@ -145,13 +164,17 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') 'andre'=>$langs->trans("Yes").' (style andre)'); $html->select_array('main_popup_calendar',$liste_popup_calendar,$conf->global->MAIN_POPUP_CALENDAR); print ' ('.$langs->trans("AvailableOnlyIfJavascriptNotDisabled").')'; - print '
 
'.$langs->trans("UsePreviewTabs").''; print $html->selectyesno('main_use_preview_tabs',isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:1,1); - print '
 

'; @@ -252,11 +275,14 @@ else else print yn(isset($conf->global->MAIN_DISABLE_AJAX)?$conf->global->MAIN_DISABLE_AJAX:1).""; // Confirm ajax - $var=!$var; - print ''.$langs->trans("ConfirmAjax").''; - if ($conf->global->MAIN_DISABLE_JAVASCRIPT) print $langs->trans("No").' ('.$langs->trans("JavascriptDisabled").')'; - else print yn(isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0).""; - + if ($conf->global->MAIN_FEATURES_LEVEL >= 2) + { + $var=!$var; + print ''.$langs->trans("ConfirmAjax").''; + if ($conf->global->MAIN_DISABLE_JAVASCRIPT) print $langs->trans("No").' ('.$langs->trans("JavascriptDisabled").')'; + else print yn(isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0).""; + } + // Calendrier en popup $var=!$var; print ''.$langs->trans("UsePopupCalendar").''; diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index e18df43f4f2..863dc7c3b1a 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -62,6 +62,7 @@ ClosedBy=Closed by %s FileWasRemoved=File was deleted FeatureNotYetAvailable=Feature not yet available in this version FeatureExperimental=Experimental feature. Not stable in this version +FeatureDevelopment=Development feature. Not stable in this version FeaturesSupported=Features supported Width=Width Height=Height diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index cfd45c0ce62..65f6ef48787 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -62,6 +62,7 @@ ClosedBy=Clotur FileWasRemoved=Le fichier a été supprimé FeatureNotYetAvailable=Fonctionnalité pas encore disponible dans cette version FeatureExperimental=Fonctionnalité expérimentale. Non stable dans cette version +FeatureDevelopment=Fonctionnalité en développement. Non stable dans cette version FeaturesSupported=Fonctionnalités supportées Width=Largeur Height=Hauteur diff --git a/mysql/migration/2.2.0-2.4.0.sql b/mysql/migration/2.2.0-2.4.0.sql index a1a4b33cffc..dd163689291 100644 --- a/mysql/migration/2.2.0-2.4.0.sql +++ b/mysql/migration/2.2.0-2.4.0.sql @@ -11,4 +11,9 @@ ALTER TABLE llx_societe_adresse_livraison ADD COLUMN tel varchar(20) after fk_pa ALTER TABLE llx_societe_adresse_livraison ADD COLUMN fax varchar(20) after tel; alter table llx_c_barcode_type modify coder varchar(16) NOT NULL; -update llx_c_barcode_type set coder = 0 where coder in (1,2); \ No newline at end of file +update llx_c_barcode_type set coder = 0 where coder in (1,2); + +update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_ALL' and value='MAIN_FORCE_SETLOCALE_LC_ALL'; +update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_MONETARY' and value='MAIN_FORCE_SETLOCALE_LC_MONETARY'; +update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_NUMERIC' and value='MAIN_FORCE_SETLOCALE_LC_NUMERIC'; +update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_TIME' and value='MAIN_FORCE_SETLOCALE_LC_TIME';