From c7d5ac84e7a2ee0df57490bf428c26172000d4f9 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Tue, 27 Aug 2013 11:36:40 +0200
Subject: [PATCH] Fix bug #1217096

---
 src/calibre/gui2/custom_column_widgets.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index 4c5b1cce27..4223a638f2 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -12,7 +12,7 @@ from PyQt4.Qt import (QComboBox, QLabel, QSpinBox, QDoubleSpinBox, QDateTimeEdit
         QSpacerItem, QIcon, QCheckBox, QWidget, QHBoxLayout, SIGNAL,
         QPushButton, QMessageBox, QToolButton, Qt)
 
-from calibre.utils.date import qt_to_dt, now
+from calibre.utils.date import qt_to_dt, now, as_local_time, as_utc
 from calibre.gui2.complete2 import EditWithComplete
 from calibre.gui2.comments_editor import Editor as CommentsEditor
 from calibre.gui2 import UNDEFINED_QDATETIME, error_dialog
@@ -189,10 +189,10 @@ class DateTime(Base):
         l.addStretch(2)
 
         w = self.widgets[1]
-        format = cm['display'].get('date_format','')
-        if not format:
-            format = 'dd MMM yyyy hh:mm'
-        w.setDisplayFormat(format)
+        format_ = cm['display'].get('date_format','')
+        if not format_:
+            format_ = 'dd MMM yyyy hh:mm'
+        w.setDisplayFormat(format_)
         w.setCalendarPopup(True)
         w.setMinimumDateTime(UNDEFINED_QDATETIME)
         w.setSpecialValueText(_('Undefined'))
@@ -214,6 +214,12 @@ class DateTime(Base):
             val = qt_to_dt(val)
         return val
 
+    def normalize_db_val(self, val):
+        return as_local_time(val) if val is not None else None
+
+    def normalize_ui_val(self, val):
+        return as_utc(val) if val is not None else None
+
 class Comments(Base):
 
     def setup_ui(self, parent):
@@ -823,6 +829,12 @@ class BulkDateTime(BulkBase):
             val = qt_to_dt(val)
         return val
 
+    def normalize_db_val(self, val):
+        return as_local_time(val) if val is not None else None
+
+    def normalize_ui_val(self, val):
+        return as_utc(val) if val is not None else None
+
 class BulkSeries(BulkBase):
 
     def setup_ui(self, parent):