Index: trunk/core/kernel/utility/formatters/date_formatter.php
===================================================================
diff -u -r4758 -r5340
--- trunk/core/kernel/utility/formatters/date_formatter.php	(.../date_formatter.php)	(revision 4758)
+++ trunk/core/kernel/utility/formatters/date_formatter.php	(.../date_formatter.php)	(revision 5340)
@@ -52,7 +52,7 @@
 			if ( !isset($object->CalculatedFields)  || !is_array($object->CalculatedFields) ) {
 				$object->CalculatedFields = Array();
 			}
-			$object->CalculatedFields[$field_name.'_formatted'] = 'FROM_UNIXTIME('.'`%1$s`.'.$field_name.', \''.$this->SQLFormat($field_options['format']).'\')';
+			$object->CalculatedFields[$field_name.'_formatted'] = 'FROM_UNIXTIME('.'`%1$s`.'.$field_name.' + '.$this->Application->TimeZoneAdjustment().', \''.$this->SQLFormat($field_options['format']).'\')';
 			$opts['format'] = $field_options['format'];
 			$opts['required'] = 0;
 			unset($opts['master_field']);
@@ -109,7 +109,7 @@
 		$options = $object->GetFieldOptions($field_name);
 		if ( isset($format) ) $options['format'] = $format;
 
-		return adodb_date($options['format'], $value);
+		return adodb_date($options['format'], $value + $this->Application->TimeZoneAdjustment());
 	}
 
 	function HumanFormat($format)
@@ -323,7 +323,7 @@
 			return $value;
 		}
 		// echo "day: $day, month: $month, year: $year, hour: $hour, minute: $minute<br>";
-		return adodb_mktime($hour, $minute, $second, $month, $day, $year);
+		return adodb_mktime($hour, $minute, $second, $month, $day, $year) - $this->Application->TimeZoneAdjustment();
 	}
 
 	function GetSample($field, &$options, &$object)