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

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

Browse Source 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
This commit is contained in:
Laurent Destailleur
2015-03-11 03:55:46 +01:00
parent ec322e2e29 c1432eb2da
commit a5645b626c
14 changed files with 182 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/db/DoliDB.class.php
View File

@@ -275,8 +275,7 @@ abstract class DoliDB implements Database
*/
function jdate($string, $gm=false)
{
if($string==0 || $string=="0000-00-00 00:00:00")
return NULL;
if ($string==0 || $string=="0000-00-00 00:00:00") return '';
$string=preg_replace('/([^0-9])/i','',$string);
$tmp=$string.'000000';
$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);