openerp-dev-web team mailing list archive

["Julien Thewys \(OpenERP\)" <jth@xxxxxxxxxxx>]

Julien Thewys (OpenERP) has proposed merging lp:~openerp-groupes/openobject-client-web/fix_calendar_date_event into lp:openobject-client-web.

Requested reviews:
  OpenERP SA's Web Client R&D (openerp-dev-web)


Fixes display of calendar event when boundaries are of type date.

Calendar events of type date were displayed like ending one day earlier than they should be.

I'm proposing the same fix for gtk client.
-- 
https://code.launchpad.net/~openerp-groupes/openobject-client-web/fix_calendar_date_event/+merge/36299
Your team OpenERP SA's Web Client R&D is requested to review the proposed merge of lp:~openerp-groupes/openobject-client-web/fix_calendar_date_event into lp:openobject-client-web.

=== modified file 'addons/view_calendar/widgets/_base.py'
--- addons/view_calendar/widgets/_base.py	2010-08-10 12:08:29 +0000
+++ addons/view_calendar/widgets/_base.py	2010-09-22 13:57:03 +0000
@@ -215,10 +215,13 @@
             if event[fld] and fmt:
                 event[fld] = time.strptime(event[fld], fmt)
 
-            # default start time is 9:00 AM
-            if typ == 'date' and fld == self.date_start:
+            # default start/stop time is 9:00 AM / 5:00 PM
+            if typ == 'date' and event[fld]:
                 ds = list(event[fld])
-                ds[3] = 9
+                if fld == self.date_start:
+                    ds[3] = 9
+                elif fld == self.date_stop:
+                    ds[3] = 17
                 event[fld] = tuple(ds)
 
     def get_events(self, days):