diff --git a/CAD/CAD_TRI.SRC b/CAD/CAD_TRI.SRC
index 2d9e1851..8e24bf5d 100644
--- a/CAD/CAD_TRI.SRC
+++ b/CAD/CAD_TRI.SRC
@@ -1,5 +1,5 @@
-/*  REVISIONS:
- *
+/*  $Revision: 7 $
+ *  $Modtime: 21-09-05 13:11 $
  */
 
 #include "comsql.h"
@@ -8,29 +8,63 @@ CREATE_TRIGGER(cad_t_cad_tekening_B_IU)
 BEFORE INSERT OR UPDATE ON cad_tekening
 FOR EACH ROW
 BEGIN
-  -- Deze trigger is ook gedefinieerd in CAD !!
-  UPDATE_PRIMARY_KEY(cad_tekening_key
-                    ,cad_s_cad_tekening_key);
-  UPDATE_AANMAAKDATUM(cad_tekening
-                     ,cad_tekening_aanmaak);
-   IF :new.cad_tekening_type IN ('P', 'C') AND
-     :new.ins_discipline_key IS NOT NULL       
-   THEN
-     APPLICATION_ERROR(-20000, 'CAD_M010');   
-   END IF;
-#ifdef PRJ
-  IF :new.prj_project_key IS NOT NULL
-  THEN
-    :new.cad_tekening_filenaam := :new.cad_tekening_key ||'.DWG';
-  END IF;
-#endif
+  -- Deze trigger is ook gedefinieerd in PRJ !!
+  UPDATE_PRIMARY_KEY(cad_tekening_key, cad_s_cad_tekening_key);
+  UPDATE_AANMAAKDATUM(cad_tekening, cad_tekening_aanmaak);
+  BEGIN IF :new.alg_verdieping_key IS NOT NULL THEN 
+    SELECT alg_locatie_key INTO :new.alg_locatie_key 
+    FROM alg_gebouw G, alg_verdieping V 
+    WHERE G.alg_gebouw_key=V.alg_gebouw_key 
+    AND V.alg_verdieping_key=:new.alg_verdieping_key;
+  END IF; END; 
 END;
 /
 
-CREATE_TRIGGER(cad_t_cad_symbool_B_IU)
-BEFORE INSERT OR UPDATE ON cad_symbool
+CREATE_TRIGGER(cad_t_cad_tekening_A_U)
+AFTER UPDATE ON cad_tekening
 FOR EACH ROW
 BEGIN
-   UPDATE_PRIMARY_KEY(cad_symbool_key, cad_s_cad_symbool_key);  
+    DELETE FROM cad_tekening WHERE cad_tekening_filenaam IS NULL;
 END;
 /
+
+
+CREATE_TRIGGER(cad_t_cad_legenda_B_IU)
+BEFORE INSERT OR UPDATE ON cad_legenda
+FOR EACH ROW
+BEGIN
+   UPDATE_PRIMARY_KEY(cad_legenda_key, cad_s_cad_legenda_key);  
+END;
+/
+
+CREATE_TRIGGER(cad_t_cad_legendawaarde_B_IU)
+BEFORE INSERT OR UPDATE ON cad_legendawaarde
+FOR EACH ROW
+BEGIN
+   UPDATE_PRIMARY_KEY(cad_legendawaarde_key, cad_s_cad_legendawaarde_key);  
+END;
+/
+
+CREATE_TRIGGER(cad_t_cad_thema_B_IU)
+BEFORE INSERT OR UPDATE ON cad_thema
+FOR EACH ROW
+BEGIN
+   UPDATE_PRIMARY_KEY(cad_thema_key, cad_s_cad_thema_key);  
+END;
+/
+
+CREATE_TRIGGER(cad_t_cad_label_B_IU)
+BEFORE INSERT OR UPDATE ON cad_label
+FOR EACH ROW
+BEGIN
+   UPDATE_PRIMARY_KEY(cad_label_key, cad_s_cad_label_key);  
+END;
+/
+
+CREATE_TRIGGER(cad_t_cad_imp_contour_B_IU)
+BEFORE INSERT OR UPDATE ON cad_imp_contour
+FOR EACH ROW
+BEGIN
+   UPDATE_PRIMARY_KEY(cad_imp_contour_key,cad_s_cad_imp_contour_key);
+END;
+/
\ No newline at end of file