Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 15:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.3' into develop

Browse Source 
Conflicts:
	htdocs/core/boxes/box_activity.php
This commit is contained in:
Laurent Destailleur
2013-01-19 16:29:16 +01:00
parent 0e060cac11 3551dff18a
commit abb6daf2dc
32 changed files with 255 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/phpunit/DateLibTest.php
View File

@@ -217,16 +217,16 @@ class DateLibTest extends PHPUnit_Framework_TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('1970-01-01 00:00:00',$result);
// Check %Y-%m-%d %H:%M:%S format
$result=dol_print_date(16725225600,'%Y-%m-%d %H:%M:%S',true); // http://www.epochconverter.com/
print __METHOD__." result=".$result."\n";
$this->assertEquals('2500-01-01 00:00:00',$result);
// Check %Y-%m-%d %H:%M:%S format
$result=dol_print_date(16725225600,'%Y-%m-%d %H:%M:%S',true); // http://www.epochconverter.com/
print __METHOD__." result=".$result."\n";
$this->assertEquals('2500-01-01 00:00:00',$result);
// Check %Y-%m-%d %H:%M:%S format
$result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',true); // http://www.epochconverter.com/
print __METHOD__." result=".$result."\n";
$this->assertEquals('1912-01-01 00:00:00',$result); // dol_print_date use TZ (good) but epoch converter does not use it.
// Check %Y-%m-%d %H:%M:%S format
$result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',true); // http://www.epochconverter.com/
print __METHOD__." result=".$result."\n";
$this->assertEquals('1912-01-01 00:00:00',$result); // dol_print_date use TZ (good) but epoch converter does not use it.
// Check %Y-%m-%d %H:%M:%S format
$result=dol_print_date(-11676096000,'%Y-%m-%d %H:%M:%S',true); // http://www.epochconverter.com/
print __METHOD__." result=".$result."\n";