Commit f595eba6 authored by Jean-Paul Smets's avatar Jean-Paul Smets

fixed Date comparison problem in isDivergent


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@111 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5d07df0f
...@@ -499,6 +499,9 @@ une liste de mouvements...""" ...@@ -499,6 +499,9 @@ une liste de mouvements..."""
emit targetUnreachable ! emit targetUnreachable !
""" """
from DateTime import DateTime from DateTime import DateTime
if self.getStartDate() is None or self.getTargetStartDate() is None \
or self.getStopDate() is None or self.getTargetStopDate() is None:
return 1
# This is uggly but required due to python2.2/2.3 Zope 2.6/2.7 inconsistency in _millis calculation # This is uggly but required due to python2.2/2.3 Zope 2.6/2.7 inconsistency in _millis calculation
if self.getStartDate().Date() != self.getTargetStartDate().Date() or \ if self.getStartDate().Date() != self.getTargetStartDate().Date() or \
self.getStopDate().Date() != self.getTargetStopDate().Date(): self.getStopDate().Date() != self.getTargetStopDate().Date():
......
...@@ -382,6 +382,9 @@ a service in a public administration).""" ...@@ -382,6 +382,9 @@ a service in a public administration)."""
emit targetUnreachable ! emit targetUnreachable !
""" """
if self.getStartDate() is None or self.getTargetStartDate() is None \
or self.getStopDate() is None or self.getTargetStopDate() is None:
return 1
# This is uggly but required due to python2.2/2.3 Zope 2.6/2.7 inconsistency in _millis calculation # This is uggly but required due to python2.2/2.3 Zope 2.6/2.7 inconsistency in _millis calculation
return self.getQuantity() != self.getTargetQuantity() or \ return self.getQuantity() != self.getTargetQuantity() or \
self.getStartDate().Date() != self.getTargetStartDate().Date() or \ self.getStartDate().Date() != self.getTargetStartDate().Date() or \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment