Index: cT167.mac.rou
===================================================================
diff -u -r29059 -r43422
--- cT167.mac.rou	(.../cT167.mac.rou)	(revision 29059)
+++ cT167.mac.rou	(.../cT167.mac.rou)	(revision 43422)
@@ -9,7 +9,14 @@
 	; 
 	; Titel + locken
 1	D P^cA612(2,1,20,80,1,1,1,1,$P($T(@("T0"_QT)),U,2),0,0,7,1,1)
-	L +@("^"_Q_"BA(39)"):2 E  D TXT^cAFA1(14) G YZ
+	; KO - 18.09.08 - Indien ook nieuwe boekhouding: locken ^DATA(,"Q"
+	; I '$$LOCKFRM^cTN901(Q) G YZ
+	I '$$TESTQ G 11
+	S REFQ=$P($$REF^cAFA10(Q,"Q"),D)
+	S REFQ=$$REPL^cAFA10(REFQ,"UI1","UI1Q")
+	S UI1Q=Q
+	L +@REFQ:2 E  D TXT^cAFA1(14) G YZ
+11	L +@("^"_Q_"BA(39)"):2 E  D TXT^cAFA1(14) G Y6
 	L +@("^"_Q_"BA(25)"):2 E  D TXT^cAFA1(14) G Y5
 	L +@("^"_Q_"BA(33)"):2 E  D TXT^cAFA1(14) G Y4
 	L +@("^"_Q_"BA(74)"):2 E  D TXT^cAFA1(14) G Y3
@@ -44,8 +51,13 @@
 	S $P(^(7),D,2)=$P(J,D,2)                ; Telefoon jaarlisting
 	S $P(^(7),D,3)=$P(K,D)                  ; Contactpersoon kwartaalopgave
 	S $P(^(7),D,4)=$P(K,D,2)                ; Telefoon kwartaalopgave
+	S $P(^(7),D,5)=$P(J,D,3)                ; E-mail adres jaarlisting
+	S $P(^(7),D,6)=$P(K,D,3)                ; E-mail adres kwartaalopgave
 	;S E=$TR($G(@("^"_Q_"BA")@("%T",13,"E"),"A:\"),D,"/") ; KD - 26.06.07
 	;S $P(^DPAR(0,"PAR","BH",8),D)=E ; KD - 26.06.07
+	I '$$TESTQ G 3  ; geen licentie
+	S $P(^DPAR(0,"PAR","BH",8),D,4)=$$SIG^cAFA1("Q",Q,265)    ; Default map voor maandafsluiting
+	S $P(^DPAR(0,"PAR","BH",8),D,5)=$$SIG^cAFA1("Q",Q,1001)   ; Default map voor PDF bestand
 	;
 	; V6 met logging v/d wijzigingen
 3	N UQA,USA S UQA=0,USA="PAR.BH"
@@ -76,6 +88,13 @@
 	S K=$P(^DPAR(0,"PAR","BH",7),D,3,4)
 	S @("^"_Q_"BA")@("%T",13,"J",1)=J
 	S @("^"_Q_"BA")@("%T",13,"K",1)=K
+	S $P(@("^"_Q_"BA(""%T"",13,""J"",1)"),D,3)=$P(^DPAR(0,"PAR","BH",7),D,5)
+	S $P(@("^"_Q_"BA(""%T"",13,""K"",1)"),D,3)=$P(^DPAR(0,"PAR","BH",7),D,6)
+	I '$$TESTQ G Y
+	K TAB
+         S TAB(265)=$P(^DPAR(0,"PAR","BH",8),D,4)
+         S TAB(1001)=$P(^DPAR(0,"PAR","BH",8),D,5)
+         D B^cAN220("Q","",Q,"TAB")
 	;
 	; einde
 Y	L -@("^"_Q_"BA")@("%T",13)
@@ -84,7 +103,24 @@
 Y3	L -@("^"_Q_"BA(33)")
 Y4	L -@("^"_Q_"BA(25)")
 Y5	L -@("^"_Q_"BA(39)")
+	; KO - 18.09.08 - Indien ook nieuwe boekhouding: gegevens overzetten naar ^DATA(,"Q"
+Y6	; S OK=$$PARBH^cTN901(Q,2)
+	I $L($G(REFQ)) L -@REFQ
 YZ	D C^cA612 Q
 	;
+PADPDF(PAD)	; Testen of ingegeven pad niet gelijk is aan pad BH
+	N R
+	S $ZT="TRAP^cAN000"
+	S R=1
+	I '$L(PAD) G PADPFZ
+	I PAD=$P(B(9),D,4) S R=0
+PADPFZ	Q R 
+	;
+TESTQ()	; Testen of ^DATA(,"Q" bestaat
+	N UQCQ,USCQ,R
+	S $ZT="TRAP^cAN000"
+	S R=1
+	D DMS^cAN000("UQCQ","USCQ","Q",1) I '$L(UQCQ)!'$L(USCQ) S R=0  ; geen licentie
+TESTQZ	Q R
+	;
 ZZ	; 04.08.08 - 17 u 33 * V9.02
-