diff --git a/CONN/conn.sql b/CONN/conn.sql
index 9a7e62fda..1d2b826ce 100644
--- a/CONN/conn.sql
+++ b/CONN/conn.sql
@@ -1,7 +1,7 @@
 -- Script containing customer specific configuration sql statements for CONN: Connexxion
 -- (c) 2005-2006 Dijkoraad IT bv
--- $Revision: 133 $
--- $Modtime: 7-08-08 12:21 $
+-- $Revision: 134 $
+-- $Modtime: 12-09-08 10:14 $
 --
 -- Support: +31 53 4800700
 
@@ -2318,10 +2318,7 @@ AS
       AND c.cnt_contract_key = k1.cnt_contract_key(+)
       AND 26 = k1.cnt_kenmerk_key(+)
       AND k1.cnt_kenmerkcontract_verwijder IS NULL
-      AND (   (SYSDATE BETWEEN c.cnt_contract_looptijd_van AND c.cnt_contract_rappeldatum)
-           OR (SYSDATE BETWEEN c.cnt_contract_rappeldatum AND c.cnt_contract_opzegdatum)
-           OR (SYSDATE BETWEEN c.cnt_contract_opzegdatum AND c.cnt_contract_looptijd_tot + 1)
-          );
+      AND SYSDATE BETWEEN c.cnt_contract_looptijd_van AND c.cnt_contract_looptijd_tot + 1;
 
 
 /* Formatted on 2005/09/13 14:07 (Formatter Plus v4.8.5) */
@@ -2871,18 +2868,16 @@ BEGIN
   END IF;
   CLOSE c1;
 
-  IF v_remove_contract_key = -1 THEN
+  IF v_remove_contract_key <> -1 THEN
     SELECT count(*)
 	  INTO v_count
 	  FROM CNT_CONTRACT_ONRGOED
 	 WHERE CNT_CONTRACT_KEY = v_remove_contract_key;
 
-    IF v_count = NULL THEN
+    IF v_count = 0 THEN
       UPDATE CNT_CONTRACT SET CNT_CONTRACT_LOOPTIJD_TOT = sysdate + 10,
-	                          CNT_CONTRACT_RAPPELDATUM = sysdate + 10,
-                              CNT_CONTRACT_OPZEGDATUM = sysdate + 10,
                               CNT_CONTRACT_LOOPTIJD_VAN = sysdate + 9
-      where CNT_CONTRACT_KEY = v_remove_contract_key;
+      WHERE CNT_CONTRACT_KEY = v_remove_contract_key;
 
       UPDATE CNT_CONTRACT SET CNT_CONTRACT_VERWIJDER = sysdate
       WHERE CNT_CONTRACT_KEY = v_remove_contract_key;
@@ -5991,15 +5986,15 @@ SELECT 'OBJINF',
                    WHERE akd.ins_deel_key = d.ins_deel_key
                      AND akd.ins_kenmerk_key = sk.ins_kenmerk_key
                      AND akd.ins_kenmerkdeel_aanmaak NOT
-                    BETWEEN   (SELECT TO_DATE ((SELECT TO_CHAR (SYSDATE, 'YYYY') FROM DUAL) || '-' || (SELECT TO_CHAR (SYSDATE, 'MM') FROM DUAL) || '-01', 'YYYY-MM-DD HH24:MI') FROM DUAL) - 10
-                        AND   (SELECT TO_DATE ((SELECT TO_CHAR (SYSDATE, 'YYYY') FROM DUAL) || '-' || (SELECT TO_CHAR (SYSDATE, 'MM') FROM DUAL) || '-01', 'YYYY-MM-DD HH24:MI') FROM DUAL) + 14)) buiten,
+                    BETWEEN   TRUNC(SYSDATE, 'MM') - 10
+                        AND   TRUNC(SYSDATE, 'MM') + 14)) buiten,
                  COUNT((SELECT 'binnen'
                     FROM ins_v_aanwezigkenmerkdeel akd
                    WHERE akd.ins_deel_key = d.ins_deel_key
                      AND akd.ins_kenmerk_key = sk.ins_kenmerk_key
                      AND akd.ins_kenmerkdeel_aanmaak
-                    BETWEEN   (SELECT TO_DATE ((SELECT TO_CHAR (SYSDATE, 'YYYY') FROM DUAL) || '-' || (SELECT TO_CHAR (SYSDATE, 'MM') FROM DUAL) || '-01', 'YYYY-MM-DD HH24:MI') FROM DUAL) - 10
-                        AND   (SELECT TO_DATE ((SELECT TO_CHAR (SYSDATE, 'YYYY') FROM DUAL) || '-' || (SELECT TO_CHAR (SYSDATE, 'MM') FROM DUAL) || '-01', 'YYYY-MM-DD HH24:MI') FROM DUAL) + 14)) binnen
+                    BETWEEN   TRUNC(SYSDATE, 'MM') - 10
+                        AND   TRUNC(SYSDATE, 'MM') + 14)) binnen
             FROM ins_v_srtdeel_kenmerk sk,
                  ins_v_aanwezigdeel d,
                  ins_srtdeel sd,
@@ -6818,6 +6813,47 @@ AS
              FROM alg_locatie l) b ON a.locatie_key = b.locatie_key
 /
 
+CREATE OR REPLACE VIEW conn_v_rap_kostenkwartaal (fclt_f_locatie_code,
+                                                  fclt_f_locatie_omschrijving,
+                                                  fclt_f_jaar,
+                                                  fclt_f_kwartaal,
+                                                  fclt_f_soort_melding,
+                                                  aantal,
+                                                  werkelijke_kosten
+                                                 )
+AS
+   SELECT   c21, c20, c30, c31, c32, COUNT (c0), SUM (c27)
+       FROM (SELECT DISTINCT m.mld_melding_key c0,
+                             alg_locatie_code c21,
+                             alg_locatie_omschrijving c20,
+                             COALESCE
+                                     ((SELECT SUM (f.fin_factuur_totaal)
+                                         FROM fin_factuur f, mld_opdr o2
+                                        WHERE f.mld_opdr_key = o2.mld_opdr_key
+                                          AND o2.mld_melding_key =
+                                                             m.mld_melding_key),
+                                      0
+                                     ) c27,
+                             TO_CHAR (mld_melding_datum, 'yyyy') c30,
+                             TO_CHAR ( (TRUNC (  TO_NUMBER
+                                                  (TO_CHAR (mld_melding_datum,
+                                                            'mm'
+                                                           )
+                                                  )
+                                       / 4
+                                      )
+                               )
+                             + 1) c31,
+                             mld_stdmelding_omschrijving c32
+                        FROM mld_melding m, mld_discipline md, alg_locatie l, mld_stdmelding st
+                       WHERE m.mld_alg_locatie_key = l.alg_locatie_key
+                         AND m.mld_stdmelding_key = st.mld_stdmelding_key
+                         AND m.mld_ins_discipline_key = md.ins_discipline_key
+                         AND md.ins_srtdiscipline_key = 1)
+   GROUP BY c20, c21, c30, c31, c32
+   ORDER BY 1, 2, 3 DESC;
+
+
 COMMIT;
 
 SPOOL OFF