[Erp5-report] r18358 - in /erp5/trunk/products/ERP5: Document/Alarm.py tests/testAlarm.py

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Dec 17 15:27:15 CET 2007


Author: alex
Date: Mon Dec 17 15:27:14 2007
New Revision: 18358

URL: http://svn.erp5.org?rev=18358&view=rev
Log:
Convert the date to the user provided timezone, also change the test to use
another timezone than UTC.

Modified:
    erp5/trunk/products/ERP5/Document/Alarm.py
    erp5/trunk/products/ERP5/tests/testAlarm.py

Modified: erp5/trunk/products/ERP5/Document/Alarm.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Alarm.py?rev=18358&r1=18357&r2=18358&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Alarm.py (original)
+++ erp5/trunk/products/ERP5/Document/Alarm.py Mon Dec 17 15:27:14 2007
@@ -415,4 +415,7 @@
       periodicity_start_date = self.getPeriodicityStartDate()
       if alarm_date < periodicity_start_date:
         alarm_date = periodicity_start_date
+      # convert the date to the user provided timezone
+      alarm_zone = periodicity_start_date.timezone()
+      alarm_date = alarm_date.toZone(alarm_zone)
     return alarm_date

Modified: erp5/trunk/products/ERP5/tests/testAlarm.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAlarm.py?rev=18358&r1=18357&r2=18358&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAlarm.py (original)
+++ erp5/trunk/products/ERP5/tests/testAlarm.py Mon Dec 17 15:27:14 2007
@@ -58,7 +58,7 @@
   quantity = 10
   base_price = 0.7832
   # year/month/day hour:minute:second
-  date_format = '%i/%i/%i %i:%i:%d UTC'
+  date_format = '%i/%i/%i %i:%i:%d GMT+0100'
 
   def getTitle(self):
     return "Alarm"




More information about the Erp5-report mailing list