From 64c7ae1667401cade30b06a0ed4026f61ad5b717 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 12 May 2012 16:27:20 +0200
Subject: [PATCH] Fix: hour reported is not user hour. To fix this, we show
 both hour "server and user" but only if it differs.

---
 htdocs/core/lib/functions2.lib.php | 46 +++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index cb9f9e41932..7802879d9ca 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -129,6 +129,7 @@ function dol_print_file($langs,$filename,$searchalt=0)
 
 /**
  *	Show informations on an object
+ *  TODO Move this into html.formother
  *
  *	@param	Object	$object			Objet to show
  *	@return	void
@@ -138,6 +139,9 @@ function dol_print_object_info($object)
     global $langs,$db;
     $langs->load("other");
 
+    $deltadateforuser=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
+    //$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
+
     // Import key
     if (isset($object->import_key))
     print $langs->trans("ImportedWithSet")." : " . $object->import_key . '<br>';
@@ -161,7 +165,11 @@ function dol_print_object_info($object)
 
     // Date creation
     if (isset($object->date_creation))
-    print $langs->trans("DateCreation")." : " . dol_print_date($object->date_creation,"dayhourtext") . '<br>';
+    {
+        print $langs->trans("DateCreation")." : " . dol_print_date($object->date_creation,"dayhourtext");
+        if ($deltadateforuser) print ' &nbsp;'.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhourtext").' &nbsp;'.$langs->trans("ClientHour");
+        print '<br>';
+    }
 
     // User change
     if (isset($object->user_modification))
@@ -182,7 +190,11 @@ function dol_print_object_info($object)
 
     // Date change
     if (isset($object->date_modification))
-    print $langs->trans("DateLastModification")." : " . dol_print_date($object->date_modification,"dayhourtext") . '<br>';
+    {
+        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 '<br>';
+    }
 
     // User validation
     if (isset($object->user_validation))
@@ -203,7 +215,11 @@ function dol_print_object_info($object)
 
     // Date validation
     if (isset($object->date_validation))
-    print $langs->trans("DateValidation")." : " . dol_print_date($object->date_validation,"dayhourtext") . '<br>';
+    {
+        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 '<br>';
+    }
 
     // User approve
     if (isset($object->user_approve))
@@ -224,7 +240,11 @@ function dol_print_object_info($object)
 
     // Date approve
     if (isset($object->date_approve))
-    print $langs->trans("DateApprove")." : " . dol_print_date($object->date_approve,"dayhourtext") . '<br>';
+    {
+        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 '<br>';
+    }
 
     // User close
     if (isset($object->user_cloture))
@@ -245,7 +265,11 @@ function dol_print_object_info($object)
 
     // Date close
     if (isset($object->date_cloture))
-    print $langs->trans("DateClosing")." : " . dol_print_date($object->date_cloture,"dayhourtext") . '<br>';
+    {
+        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 '<br>';
+    }
 
     // User conciliate
     if (isset($object->user_rappro))
@@ -266,11 +290,19 @@ function dol_print_object_info($object)
 
     // Date conciliate
     if (isset($object->date_rappro))
-    print $langs->trans("DateConciliating")." : " . dol_print_date($object->date_rappro,"dayhourtext") . '<br>';
+    {
+        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 '<br>';
+    }
 
     // Date send
     if (isset($object->date_envoi))
-    print $langs->trans("DateLastSend")." : " . dol_print_date($object->date_envoi,"dayhourtext") . '<br>';
+    {
+        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 '<br>';
+    }
 }
 
 /**