From 5eff1d338e4430fef68309e819ad40db6fed90f4 Mon Sep 17 00:00:00 2001 From: Karl Burkhart Date: Mon, 26 Sep 2011 11:42:57 +0000 Subject: [PATCH] =?UTF-8?q?checkBestellung=20->=20freigegeben=20aber=20nic?= =?UTF-8?q?ht=20bestellt=20filter=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/wawi_bestellung.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wawi_bestellung.class.php b/include/wawi_bestellung.class.php index fc50cb4b7..312002285 100644 --- a/include/wawi_bestellung.class.php +++ b/include/wawi_bestellung.class.php @@ -903,8 +903,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') 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 + (SELECT bestellung_id FROM wawi.tbl_bestellung_bestellstatus where bestellung_id=b.bestellung_id AND bestellstatus_kurzbz ='Bestellung') and (bestellstatus_kurzbz = ('Abgeschickt') OR bestellstatus_kurzbz = ('Freigegeben')) + 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";