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

Fix: valeur NULL des constantes MAIN_FORCE_SETLOCALE

Browse Source
This commit is contained in:
Regis Houssin 2005-07-07 13:54:24 +00:00
parent 80c6916210
commit 9b736544df
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/master.inc.php
View File

@ -4,6 +4,7 @@
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005 Regis Houssin <regis.houssin@cap-networks.com>
*
* 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
@ -175,10 +176,10 @@ $conf->langage_tiret=ereg_replace('_','-',$conf->langage);
setlocale(LC_ALL, $conf->langage_tiret); // Compenser pb de locale avec windows
setlocale(LC_ALL, $conf->langage);
if (defined("MAIN_FORCE_SETLOCALE_LC_ALL")) setlocale(LC_ALL, MAIN_FORCE_SETLOCALE_LC_ALL);
if (defined("MAIN_FORCE_SETLOCALE_LC_TIME")) setlocale(LC_TIME, MAIN_FORCE_SETLOCALE_LC_TIME);
if (defined("MAIN_FORCE_SETLOCALE_LC_NUMERIC")) setlocale(LC_NUMERIC, MAIN_FORCE_SETLOCALE_LC_NUMERIC);
if (defined("MAIN_FORCE_SETLOCALE_LC_MONETARY")) setlocale(LC_MONETARY, MAIN_FORCE_SETLOCALE_LC_MONETARY);
if (defined("MAIN_FORCE_SETLOCALE_LC_ALL") && MAIN_FORCE_SETLOCALE_LC_ALL) setlocale(LC_ALL, MAIN_FORCE_SETLOCALE_LC_ALL);
if (defined("MAIN_FORCE_SETLOCALE_LC_TIME") && MAIN_FORCE_SETLOCALE_LC_TIME) setlocale(LC_TIME, MAIN_FORCE_SETLOCALE_LC_TIME);
if (defined("MAIN_FORCE_SETLOCALE_LC_NUMERIC") && MAIN_FORCE_SETLOCALE_LC_NUMERIC) setlocale(LC_NUMERIC, MAIN_FORCE_SETLOCALE_LC_NUMERIC);
if (defined("MAIN_FORCE_SETLOCALE_LC_MONETARY") && MAIN_FORCE_SETLOCALE_LC_MONETARY) setlocale(LC_MONETARY, MAIN_FORCE_SETLOCALE_LC_MONETARY);
require_once(DOL_DOCUMENT_ROOT ."/translate.class.php");
$langs = new Translate(DOL_DOCUMENT_ROOT ."/langs", $conf->langage);

8
mysql/data/data.sql
View File

@ -145,10 +145,10 @@ insert into llx_const (name, value, type, visible) values ('FACTURE_ADDON_PDF',
--
-- Forcer les locales
--
INSERT INTO `llx_const` VALUES (150, 'MAIN_FORCE_SETLOCALE_LC_ALL', '', 'chaine', 1, '');
INSERT INTO `llx_const` VALUES (152, 'MAIN_FORCE_SETLOCALE_LC_TIME', '', 'chaine', 1, '');
INSERT INTO `llx_const` VALUES (156, 'MAIN_FORCE_SETLOCALE_LC_MONETARY', '', 'chaine', 1, '');
INSERT INTO `llx_const` VALUES (158, 'MAIN_FORCE_SETLOCALE_LC_NUMERIC', '', 'chaine', 1, '');
INSERT INTO `llx_const` VALUES ('', 'MAIN_FORCE_SETLOCALE_LC_ALL', 'MAIN_FORCE_SETLOCALE_LC_ALL', 'chaine', 1, '');
INSERT INTO `llx_const` VALUES ('', 'MAIN_FORCE_SETLOCALE_LC_TIME', 'MAIN_FORCE_SETLOCALE_LC_TIME', 'chaine', 1, '');
INSERT INTO `llx_const` VALUES ('', 'MAIN_FORCE_SETLOCALE_LC_MONETARY', 'MAIN_FORCE_SETLOCALE_LC_MONETARY', 'chaine', 1, '');
INSERT INTO `llx_const` VALUES ('', 'MAIN_FORCE_SETLOCALE_LC_NUMERIC', 'MAIN_FORCE_SETLOCALE_LC_NUMERIC', 'chaine', 1, 'mettre la valeur C si problème de centimes');
-- Dictionnaires llx_c

8
mysql/migration/1.1.0-2.0.0.sql
View File

@ -1540,7 +1540,7 @@ create table llx_dolibarr_modules
)type=innodb;
INSERT INTO `llx_const` VALUES (150, 'MAIN_FORCE_SETLOCALE_LC_ALL', '', 'chaine', 1, '');
INSERT INTO `llx_const` VALUES (152, 'MAIN_FORCE_SETLOCALE_LC_TIME', '', 'chaine', 1, '');
INSERT INTO `llx_const` VALUES (156, 'MAIN_FORCE_SETLOCALE_LC_MONETARY', '', 'chaine', 1, '');
INSERT INTO `llx_const` VALUES (158, 'MAIN_FORCE_SETLOCALE_LC_NUMERIC', '', 'chaine', 1, '');
insert into `llx_const` values ('', 'MAIN_FORCE_SETLOCALE_LC_ALL', 'MAIN_FORCE_SETLOCALE_LC_ALL', 'chaine', 1, '');
insert into `llx_const` values ('', 'MAIN_FORCE_SETLOCALE_LC_TIME', 'MAIN_FORCE_SETLOCALE_LC_TIME', 'chaine', 1, '');
insert into `llx_const` values ('', 'MAIN_FORCE_SETLOCALE_LC_MONETARY', 'MAIN_FORCE_SETLOCALE_LC_MONETARY', 'chaine', 1, '');
insert into `llx_const` values ('', 'MAIN_FORCE_SETLOCALE_LC_NUMERIC', 'MAIN_FORCE_SETLOCALE_LC_NUMERIC', 'chaine', 1, 'mettre la valeur C si problème de centimes');