[Mpuls-commits] r292 - waska/tags/1.5.1/waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-02-24 11:54:57 +0100 (Tue, 24 Feb 2009)
New Revision: 292

Modified:
   waska/tags/1.5.1/waskaweb/lib/adelexml.py
Log:
Fixed adeleauswertung. 


Modified: waska/tags/1.5.1/waskaweb/lib/adelexml.py
===================================================================
--- waska/tags/1.5.1/waskaweb/lib/adelexml.py	2009-02-24 10:41:42 UTC (rev 291)
+++ waska/tags/1.5.1/waskaweb/lib/adelexml.py	2009-02-24 10:54:57 UTC (rev 292)
@@ -48,7 +48,9 @@
     and not (coalesce(datum_feststellung, '1970-01-01'::date) < '%s'::date
              and s.zugriff < '%s'::date)
     -- Kein Begin und Erstgespraech nicht im BZ
-    and not (datum_feststellung IS NULL and (coalesce(erstgespraech,
+    and not (
+    (coalesce(beendigung_5, now()) > '2008-12-31'::date) and
+    datum_feststellung IS NULL and (coalesce(erstgespraech,
     '1970-01-01'::date) < '%s'::date or coalesce(erstgespraech,
     '1970-01-01'::date) > '%s'::date)
     )