[Erp5-report] r36086 yusei - /erp5/trunk/products/ERP5/Document/PeriodicityLine.py

[nobody at svn.erp5.org]

Author: yusei
Date: Tue Jun  8 12:15:58 2010
New Revision: 36086

URL: http://svn.erp5.org?rev=36086&view=rev
Log:
The first start date may be the same to periodicity effective date.

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

Modified: erp5/trunk/products/ERP5/Document/PeriodicityLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PeriodicityLine.py?rev=36086&r1=36085&r2=36086&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PeriodicityLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PeriodicityLine.py [utf8] Tue Jun  8 12:15:58 2010
@@ -91,15 +91,14 @@
     expiration_date = self.getExpirationDate()
     result = []
 
-    if effective_date is not None and from_date < effective_date:
-      from_date = effective_date
     if expiration_date is not None and to_date > expiration_date:
       to_date = expiration_date
 
     next_start_date = self.getNextPeriodicalDate(from_date)
     while next_start_date <= to_date:
-      result.append((next_start_date,
-                     self.getPeriodicityTermStopDate(next_start_date)))
+      if next_start_date >= effective_date:
+        result.append((next_start_date,
+                       self.getPeriodicityTermStopDate(next_start_date)))
       
       new_next_start_date = self.getNextPeriodicalDate(next_start_date)
       if new_next_start_date==next_start_date: