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

Fix: Bad timezone function. Daylight was not used.

Browse Source
This commit is contained in:
Laurent Destailleur
2012-05-14 16:46:48 +02:00
parent 2a7cf9c6f6
commit 4a9baa590c
7 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/core/lib/functions2.lib.php
View File

@@ -140,8 +140,13 @@ function dol_print_object_info($object)
$langs->load("other");
$langs->load("admin");
$deltadateforuser=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
$deltadateforserver=getServerTimeZoneInt('now');
$deltadateforclient=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
//$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
$deltadateforuser=round($deltadateforclient-$deltadateforserver);
//print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
// Import key
if (isset($object->import_key))
@@ -167,8 +172,8 @@ function dol_print_object_info($object)
// Date creation
if (isset($object->date_creation))
{
print $langs->trans("DateCreation")." : " . dol_print_date($object->date_creation,"dayhourtext");
if ($deltadateforuser) print '  '.$langs->trans("CurrentHour").'   /   '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhourtext").'  '.$langs->trans("ClientHour");
print $langs->trans("DateCreation")." : " . dol_print_date($object->date_creation,"dayhour");
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").'   /   '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").'  '.$langs->trans("ClientHour");
print '<br>';
}
@@ -192,8 +197,8 @@ function dol_print_object_info($object)
// Date change
if (isset($object->date_modification))
{
print $langs->trans("DateLastModification")." : " . dol_print_date($object->date_modification,"dayhourtext");
if ($deltadateforuser) print ' &nbsp;'.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhourtext").' &nbsp;'.$langs->trans("ClientHour");
print $langs->trans("DateLastModification")." : " . dol_print_date($object->date_modification,"dayhour");
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
}
@@ -217,8 +222,8 @@ function dol_print_object_info($object)
// Date validation
if (isset($object->date_validation))
{
print $langs->trans("DateValidation")." : " . dol_print_date($object->date_validation,"dayhourtext");
if ($deltadateforuser) print ' &nbsp;'.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhourtext").' &nbsp;'.$langs->trans("ClientHour");
print $langs->trans("DateValidation")." : " . dol_print_date($object->date_validation,"dayhour");
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
}
@@ -242,8 +247,8 @@ function dol_print_object_info($object)
// Date approve
if (isset($object->date_approve))
{
print $langs->trans("DateApprove")." : " . dol_print_date($object->date_approve,"dayhourtext");
if ($deltadateforuser) print ' &nbsp;'.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhourtext").' &nbsp;'.$langs->trans("ClientHour");
print $langs->trans("DateApprove")." : " . dol_print_date($object->date_approve,"dayhour");
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
}
@@ -267,8 +272,8 @@ function dol_print_object_info($object)
// Date close
if (isset($object->date_cloture))
{
print $langs->trans("DateClosing")." : " . dol_print_date($object->date_cloture,"dayhourtext");
if ($deltadateforuser) print ' &nbsp;'.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhourtext").' &nbsp;'.$langs->trans("ClientHour");
print $langs->trans("DateClosing")." : " . dol_print_date($object->date_cloture,"dayhour");
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
}
@@ -292,16 +297,16 @@ function dol_print_object_info($object)
// Date conciliate
if (isset($object->date_rappro))
{
print $langs->trans("DateConciliating")." : " . dol_print_date($object->date_rappro,"dayhourtext");
if ($deltadateforuser) print ' &nbsp;'.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhourtext").' &nbsp;'.$langs->trans("ClientHour");
print $langs->trans("DateConciliating")." : " . dol_print_date($object->date_rappro,"dayhour");
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
}
// Date send
if (isset($object->date_envoi))
{
print $langs->trans("DateLastSend")." : " . dol_print_date($object->date_envoi,"dayhourtext");
if ($deltadateforuser) print ' &nbsp;'.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhourtext").' &nbsp;'.$langs->trans("ClientHour");
print $langs->trans("DateLastSend")." : " . dol_print_date($object->date_envoi,"dayhour");
if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
print '<br>';
}
}