From c595df30e3d21c99cb35435a2cd0630e3f8f1b36 Mon Sep 17 00:00:00 2001 From: Karl Burkhart Date: Wed, 16 Feb 2011 14:15:19 +0000 Subject: [PATCH] modified loadBestellungForCheck() --- include/wawi_bestellung.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/wawi_bestellung.class.php b/include/wawi_bestellung.class.php index 7f552405e..7fc85b359 100644 --- a/include/wawi_bestellung.class.php +++ b/include/wawi_bestellung.class.php @@ -855,9 +855,8 @@ class wawi_bestellung extends basis_db left join wawi.tbl_bestellung_bestellstatus as s using (bestellung_id) where b.bestellung_id not in - (SELECT bestellung_id FROM wawi.tbl_bestellung_bestellstatus where bestellung_id=b.bestellung_id AND bestellstatus_kurzbz ='Bestellung' - UNION SELECT bestellung_id FROM wawi.tbl_bestellung_bestellstatus where bestellung_id=b.bestellung_id AND bestellstatus_kurzbz NOT in ('Abgeschickt')) - and b.bestellung_id = b.bestellung_id and datum < CURRENT_DATE - '".$min." week'::interval AND datum > CURRENT_DATE - '".$max." week'::interval + (SELECT bestellung_id FROM wawi.tbl_bestellung_bestellstatus where bestellung_id=b.bestellung_id AND bestellstatus_kurzbz ='Bestellung') and bestellstatus_kurzbz = ('Abgeschickt') + and b.bestellung_id = b.bestellung_id and b.insertamum < CURRENT_DATE - '".$min." week'::interval AND b.insertamum > CURRENT_DATE - '".$max." week'::interval ) order by bestellung_id";