diff --git a/build/exe/doliwamp/php.ini.install b/build/exe/doliwamp/php.ini.install
index 2a914dfce38..ad3ef6b0e1b 100644
--- a/build/exe/doliwamp/php.ini.install
+++ b/build/exe/doliwamp/php.ini.install
@@ -707,8 +707,9 @@ extension=php_zip.dll
[Date]
; Defines the default timezone used by the date functions
-; date.timezone = UTC => You have local = greenwich.
-; Comment line to use system OS TZ.
+; date.timezone = UTC => You have local = greenwich.
+; date.timzeone = Europe/Paris => To use TZ+1
+; See http://php.net/date.timezone
;date.timezone =
;date.default_latitude = 31.7667
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 39b0a3d55b4..692dec39067 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -25,6 +25,7 @@
require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/memory.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
$langs->load("admin");
$langs->load("install");
@@ -170,7 +171,7 @@ print "
| ".$langs->trans("PHPTZ")." (php.ini d
if (function_exists('date_default_timezone_get'))
{
$var=!$var;
- print " |
| => ".$langs->trans("CurrentTimeZone")." | ";
+ print " |
| => ".$langs->trans("CurrentTimeZone")." | "; // Timezone server PHP
print date_default_timezone_get();
print " |
\n"; // value defined in http://fr3.php.net/manual/en/timezones.europe.php
}
@@ -180,6 +181,10 @@ $var=!$var;
print "| => ".$langs->trans("CurrentHour")." | ".dol_print_date(dol_now('tzserver'),'dayhour')." |
\n";
$var=!$var;
print "| => dol_print_date(0,"dayhourtext") | '.dol_print_date(0,"dayhourtext")." | ";
+$var=!$var;
+print "
| => dol_get_first_day(1970,1,false) | '.dol_get_first_day(1970,1,false)." (with dol_print_date() or idate() = ".dol_print_date(dol_get_first_day(1970,1,false),'dayhour').") | ";
+$var=!$var;
+print "
| => dol_get_first_day(1970,1,true) | '.dol_get_first_day(1970,1,true)." (with dol_print_date() or idate() = ".dol_print_date(dol_get_first_day(1970,1,true),'dayhour').") | ";
# Parent company
$var=!$var;
print "
| ".$langs->trans("CompanyTZ")." | ".$langs->trans("FeatureNotYetAvailable")." |
\n";