[Erp5-report] r31573 luke - /erp5/trunk/products/ERP5/Document/Alarm.py

[nobody at svn.erp5.org]

Author: luke
Date: Tue Jan  5 11:31:49 2010
New Revision: 31573

URL: http://svn.erp5.org?rev=31573&view=rev
Log:
 - fix condition for alarm not being configured in alarm table

Alarm can be recognised as replaceable in catalog in two cases:

 * if alarm_date from catalog is empty (existing case)
 * if alarm is not existing in catalog yet (case added by changing indentation)

Second case happens during first indexation.

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

Modified: erp5/trunk/products/ERP5/Document/Alarm.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Alarm.py?rev=31573&r1=31572&r2=31573&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Alarm.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Alarm.py [utf8] Tue Jan  5 11:31:49 2010
@@ -583,20 +583,21 @@
       result_list = self.Alarm_zGetAlarmDate(uid=self.getUid())
       if len(result_list) == 1:
         alarm_date = result_list[0].alarm_date
-        # But if the catalog does not have a valid one, replace it
-        # with the start date.
-        if alarm_date is None or alarm_date < periodicity_start_date:
-          alarm_date = periodicity_start_date
-
-        # Check if it is valid.
-        periodicity_stop_date = self.getPeriodicityStopDate()
-        if periodicity_stop_date is not None \
-              and alarm_date >= periodicity_stop_date:
-          alarm_date = None
-        else:
-          # convert the date to the user provided timezone
-          alarm_zone = periodicity_start_date.timezone()
-          alarm_date = alarm_date.toZone(alarm_zone)
+      # But if the catalog does not have a valid one, replace it
+      # with the start date.
+      if alarm_date is None or alarm_date < periodicity_start_date:
+        alarm_date = periodicity_start_date
+
+      # Check if it is valid.
+      periodicity_stop_date = self.getPeriodicityStopDate()
+      if periodicity_stop_date is not None \
+            and alarm_date >= periodicity_stop_date:
+        alarm_date = None
+      else:
+        # convert the date to the user provided timezone
+        alarm_zone = periodicity_start_date.timezone()
+        alarm_date = alarm_date.toZone(alarm_zone)
+
     return alarm_date
 
   # XXX there seem to be something which wants to call setters against