Index: agiletrac/workflow.py
===================================================================
--- agiletrac/workflow.py	(revision 275)
+++ agiletrac/workflow.py	(working copy)
@@ -300,6 +300,8 @@
                     date_name = stage['date'].get('name')
                     date = ticket[ date_name ] and ticket[ date_name ] or None
                     if date:
+                        if isinstance(date, basestring):
+                            date = parse_date(date)
                         formatted_date = format_date(date)
                         date_hint = 'Previously completed on ' + formatted_date
                         label = 'Reopen ' + stage['date'].get('stage')
@@ -366,6 +368,8 @@
                             label = stage['date'].get('label') + ' '
                             name = stage['date'].get('name')
                             date = ticket[ name ] and ticket[ name ] or None
+                            if date and isinstance(date, basestring):
+                                date = parse_date(date)
                             id = action + '_' + name
                             date_hint = 'Format: ' + get_date_format_hint()
                             date_chooser_id = 'dp_' + name
@@ -525,7 +529,10 @@
                     # We want to make sure we don't silently overwrite a size field because it was already
                     # completed and there is therefore no element of that name on the web page. Therefore
                     # first assign the current value and overwrite that if the element was present
-                    formatted_date = ticket[name] and format_date(ticket[name])
+                    raw_date_value = ticket[name]
+                    if raw_date_value and isinstance(raw_date_value, basestring):
+                        raw_date_value = parse_date(raw_date_value)
+                    formatted_date = raw_date_value and format_date(raw_date_value)
                     if req.args.has_key(arg_name):
                         new_formatted_date = req.args.get(arg_name)
                         new_date = new_formatted_date and parse_date(new_formatted_date, tzinfo=req.tz) or 0

