Index: cTN80601.mac.rou
===================================================================
diff -u -r29059 -r43422
--- cTN80601.mac.rou	(.../cTN80601.mac.rou)	(revision 29059)
+++ cTN80601.mac.rou	(.../cTN80601.mac.rou)	(revision 43422)
@@ -11,33 +11,42 @@
 T0	;BTW-listing ;
 T1	;VatList;RecipientId;SenderId;ControlRef;MandataireId;SenderDate;VersionTech;Test;
 T2	;AgentRepr;DecNumber;
-T3	;DeclarantList;
-T4	;SequenceNum;DeclarantNum;ClientNbr;TurnOverSum;TaxSum;
-T5	;CompanyInfo;
-T6	;VATNum;Name;Street;CityAndZipCode;Country;
+T3	;ClientListing;
+T4	;SequenceNumber;DeclarantReference;ClientsNbr;TurnOverSum;VATAmountSum;
+T5	;Declarant;
+T6	;VATNumber;Name;Street;PostCode;CountryCode;City;EmailAddress;
 T7	;Period;
-T8	;ClientList;
+T8	;Client;
 T9	;SequenceNum;
-T10	;CompanyInfo;VATNum;Country;
-T11	;Period;Amount;Code;TurnOver;
+T10	;CompanyInfo;CompanyVATNumber;Country;issuedBy;
+T11	;Period;VATAmount;Code;TurnOver;
 T12	;Het pad voor de BTW-listing is niet correct ingevuld.;
 T13	;Kan het uniek nummer voor de BTW-listing niet bepalen.;
 T14	;De BTW-listing is leeg;
 T15	;Postcode niet gevonden, gelieve in te vullen bij parameters boekhouding.;
+T16	;ClientListingConsignment;ClientListingsNbr;
+T17	;http://www.minfin.fgov.be/InputCommon;
+T18	;E-mail ondertekenaar werd niet ingevuld.;
+T19	;Representative;RepresentativeID;issuedBy;identificationType;Phone;
+T20	;Telefoon ondertekenaar werd niet ingevuld.;
 	;
 T0F	;List TVA ;
-T12F	;Le chemin d�exportation de la listing annuel de TVA est incorrect.;
+T12F	;Le chemin d'exportation de la listing annuel de TVA est incorrect.;
 T13F	;Impossible de d�finir le num�ro unique de la listing annuel de TVA.;
 T14F 	;Listing annuel de TVA est vide;
 T15F	;Code postal pas trouv�, s.v.p. le remplir dans param. comptables.;
+T18F	;E-mail signataire n'est pas rempli.;
+T20F	;Telephone signataire n'est pas rempli.;
 	;
-T0E	;VAT-report ;
-T12E 	;The path for the VAT-report is not correct.;
-T13E	;Could not get unique number for the VAT-report.;
-T14E 	;The VAT-report is empty;
+T0E	;VAT report ;
+T12E 	;The path for the VAT report is not correct.;
+T13E	;Could not get unique number for the VAT report.;
+T14E 	;The VAT report is empty;
 T15E	;Could not find the postal code. Please fill in at accounting param.;
+T18E	;E-mail Signer was not filled in.;
+T20E	;Telephone Signer was not filled in.;
 	;
-1	N XMLFILE,BTWNR,MAND,CTRLREF,SEQNR,NBRCLIENT,NODE,TEST,XMLPATH,B,BTW,TOTAMOUNT,TOTTURNOVER,L,A,BTWO,UI1
+1	N XMLFILE,BTWNR,MAND,CTRLREF,SEQNR,NBRCLIENT,NODE,TEST,XMLPATH,B,BTW,TOTAMOUNT,TOTTURNOVER,L,A,BTWO,UI1,POSTCODE
 	;
 	S $ZT="TRAP^cAN000"
 2	;------------------------------------------------------------------------------
@@ -65,7 +74,7 @@
 	G 220
 	;
 	; Nakijk of er klanten gevonden zijn
-23	I 'NBRCLIENT S K=$P($T(@("T14"_QT)),U,2) D:'$G(SWVB) TXT^cAFA1(250) G YZ
+23	I 'NBRCLIENT S K=$P($T(@("T14"_QT)),U,2) D:'$G(SWVB) TXT^cAFA1(250) S:$G(SWVB) OK="0\"_K G YZ
 	;
 	;------------------------------------------------------------------------------
 	; Test listing
@@ -74,13 +83,20 @@
 	S TEST=$G(SWTEST)
 	;
 24	S SENDREF=$$SENDREF(KJ)
-	I SENDREF="" S K=$P($T(@("T13"_QT)),U,2) D:'$G(SWVB) TXT^cAFA1(250) G YZ
+	I SENDREF="" S K=$P($T(@("T13"_QT)),U,2) D:'$G(SWVB) TXT^cAFA1(250) S:$G(SWVB) OK="0\"_K G YZ
 	; KU : 08.01.08 ; niet nodig aangezien Woonpl
-	; S POSTCODE=$P($G(@("^"_Q_"BA(""%T"",13,""E"",1)")),D,2)
-	; I POSTCODE'?4N S K=$P($T(@("T15"_QT)),U,2),TEMPOK=0 D TXT^cAFA1(250) G YZ
+	I $G(SWVB) S POSTCODE=$$SIG^cAFA1("Q",Q,302)
+	I '$G(SWVB) S POSTCODE=$P($G(@("^"_Q_"BA(""%T"",13,""E"",1)")),D,2)
+	I POSTCODE'?4N S K=$P($T(@("T15"_QT)),U,2),TEMPOK=0 D TXT^cAFA1(250) S:$G(SWVB) OK="0\"_K G YZ
 	;
 25	I '$G(SWVB) S B(1)=$G(@("^"_Q_"BTW(0,0)"))
 	I $G(SWVB) S B(1)=TABGEG(1)
+	;
+	; Nakijken of telefoon is ingevuld
+	I $P(B(1),D,13)="" S K=$P($T(@("T20"_QT)),U,2),TEMPOK=0 D:'$G(SWVB) TXT^cAFA1(250) S:$G(SWVB) OK="0\"_K G YZ
+	; Nakijken of e-mail adres is ingevuld
+	I $P(B(1),D,14)="" S K=$P($T(@("T18"_QT)),U,2),TEMPOK=0 D:'$G(SWVB) TXT^cAFA1(250) S:$G(SWVB) OK="0\"_K G YZ
+	;
 	; opzoeken adresgegevens
 	I $G(SWVB) S IDINDEX=5 G 3
 	S IDINDEX=4
@@ -97,10 +113,10 @@
 31	I '$G(SWVB) S XMLFILE=@("^"_Q_"BA(""%T"",13,""J"")")
 	I $G(SWVB) S XMLFILE=FILEVB
 	; Parameter niet ingevuld
-	I XMLFILE="" S K=$P($T(@("T12"_QT)),U,2) D TXT^cAFA1(250) G Y
+	I XMLFILE="" S K=$P($T(@("T12"_QT)),U,2) D:'$G(SWVB) TXT^cAFA1(250) S:$G(SWVB) OK="0\"_K G Y
 	; Nakijken of het pad bestaat - 26.06.07
 	S XMLPATH=$P(XMLFILE,D,1,$L(XMLFILE,D)-1)
-	I $$TST^cA710(XMLPATH)'=0 S K=$P($T(@("T12"_QT)),U,2) D TXT^cAFA1(250) G Y
+	I $$TST^cA710(XMLPATH)'=0 S K=$P($T(@("T12"_QT)),U,2) D:'$G(SWVB) TXT^cAFA1(250) S:$G(SWVB) OK="0\"_K G Y
 	; Bestandsnaam samenstellen
 	I '$G(SWTEST) S XMLFILE=XMLFILE_KJ_".xml"
 	I $G(SWTEST) S XMLFILE=XMLFILE_KJ_"TEST.xml"
@@ -110,82 +126,76 @@
 	S SC=XMLWRITER.StartDocument() D ENDLN
 	D
 	. ; Root element
-	. S SC=XMLWRITER.RootElement($P($T(@("T1")),U,2))
-	. ; RecipientId
-	. S SC=XMLWRITER.WriteAttribute($P($T(@("T1")),U,3),"VAT-ADMIN")
+	. ; S SC=XMLWRITER.RootElement($P($T(@("T1")),U,2))
+	. S SC=XMLWRITER.RootElement($P($T(@("T16")),U,2))
+	. S SC=XMLWRITER.WriteAttribute($P($T(@("T16")),U,3),"1")
+	. S SC=XMLWRITER.WriteAttribute("xmlns","http://www.minfin.fgov.be/ClientListingConsignment")
 	. ; SenderId
 	. S BTWNR=$P(B(1),D,7),BTWNR=$$BTW^cAFO1(BTWNR),BTWNR=$$DP^cAFA1(BTWNR)
-	. S SC=XMLWRITER.WriteAttribute($P($T(@("T1")),U,4),$E(BTWNR,3,999))
 	. ; ControlRef
 	. S CTRLREF=$TR($J(SENDREF,4)," ","0")
-	. S SC=XMLWRITER.WriteAttribute($P($T(@("T1")),U,5),$E(BTWNR,3,999)_CTRLREF)
 	. ; MandataireId
 	. S MAND=$P(B(1),D,9)
-	. S SC=XMLWRITER.WriteAttribute($P($T(@("T1")),U,6),$E(MAND,1,14))
-	. ; SenderDate
-	. S SC=XMLWRITER.WriteAttribute($P($T(@("T1")),U,7),$ZDATE($H,3))
-	. ; VersionTech
-	. S SC=XMLWRITER.WriteAttribute($P($T(@("T1")),U,8),"1.2")
-	. ; Test
-	. I TEST S SC=XMLWRITER.WriteAttribute($P($T(@("T1")),U,9),TEST)
-	. ; Xml definities
-	. S SC=XMLWRITER.WriteAttribute("xmlns","http://www.minfin.fgov.be/VatList")
-	. S SC=XMLWRITER.WriteAttribute("xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance")
-	. ; S SC=XMLWRITER.WriteAttribute("xsi:schemaLocation","http://www.minfin.fgov.be/VatList file:http://minfin.fgov.be/portail1/fr/vatlist/VatList.xsd")
 	. D ENDLN 
 	. ;
-	. ; AGENTREPR
-	. S SC=XMLWRITER.Element($P($T(@("T2")),U,2))
+	. ; Representative
+	. S SC=XMLWRITER.Element($P($T(@("T19")),U,2)) D ENDLN
 	. D
-	.. ; DecNumber
-	.. S SC=XMLWRITER.WriteAttribute($P($T(@("T2")),U,3),"1")
-	.. ;
-	.. ; COMPANY INFO
-	.. S SC=XMLWRITER.Element($P($T(@("T5")),U,2)) D ENDLN
-	.. D
-	... ; VATNum
-	... I $$DC^cAFD1(DT)<20100205 S SC=XMLWRITER.Element($P($T(@("T6")),U,2)),SC=XMLWRITER.WriteChars($E(BTWNR,3,999)),SC=XMLWRITER.EndElement() D ENDLN
-	... I $$DC^cAFD1(DT)'<20100205 S SC=XMLWRITER.Element($P($T(@("T6")),U,2)),SC=XMLWRITER.WriteChars(BTWNR),SC=XMLWRITER.EndElement() D ENDLN
-	... ; Name
-	... S SC=XMLWRITER.Element($P($T(@("T6")),U,3)),SC=XMLWRITER.WriteChars($E($P(B(1),D,2),1,32)),SC=XMLWRITER.EndElement() D ENDLN
-	... ; Street
-	... S SC=XMLWRITER.Element($P($T(@("T6")),U,4)),SC=XMLWRITER.WriteChars($E($P(B(1),D,3),1,24)),SC=XMLWRITER.EndElement() D ENDLN
-	... ; CityAndZipCode
-	... S SC=XMLWRITER.Element($P($T(@("T6")),U,5)),SC=XMLWRITER.WriteChars($E($P(B(1),D,IDINDEX),1,30)),SC=XMLWRITER.EndElement() D ENDLN
-	... ; Country
-	... S SC=XMLWRITER.Element($P($T(@("T6")),U,6)),SC=XMLWRITER.WriteChars($E(BTWNR,1,2)),SC=XMLWRITER.EndElement() D ENDLN
-	.. S SC=XMLWRITER.EndElement() D ENDLN
+	.. ; VATNum
+	.. S SC=XMLWRITER.Element($P($T(@("T19")),U,3)),SC=XMLWRITER.WriteAttribute($P($T(@("T19")),U,4),"BE"),SC=XMLWRITER.WriteAttribute($P($T(@("T19")),U,5),"NVAT"),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($E(BTWNR,3,999)),SC=XMLWRITER.EndElement() D ENDLN
+	.. ; Name
+	.. S SC=XMLWRITER.Element($P($T(@("T6")),U,3)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($E($P(B(1),D,2),1,32)),SC=XMLWRITER.EndElement() D ENDLN
+	.. ; Street
+	.. S SC=XMLWRITER.Element($P($T(@("T6")),U,4)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($E($P(B(1),D,3),1,24)),SC=XMLWRITER.EndElement() D ENDLN
+	.. ; CityAndZipCode
+	.. S SC=XMLWRITER.Element($P($T(@("T6")),U,5)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars(POSTCODE),SC=XMLWRITER.EndElement() D ENDLN
+	.. ; City
+	.. S SC=XMLWRITER.Element($P($T(@("T6")),U,7)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($P($P(B(1),D,IDINDEX)," ",2,99)),SC=XMLWRITER.EndElement() D ENDLN
+	.. ; Country
+	.. S SC=XMLWRITER.Element($P($T(@("T6")),U,6)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($E(BTWNR,1,2)),SC=XMLWRITER.EndElement() D ENDLN
+	.. ; E-mail
+	.. S SC=XMLWRITER.Element($P($T(@("T6")),U,8)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($P(B(1),D,14)),SC=XMLWRITER.EndElement() D ENDLN
+	.. ; Phone
+	.. S SC=XMLWRITER.Element($P($T(@("T19")),U,6)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($$DP^cAFA1($P(B(1),D,13))),SC=XMLWRITER.EndElement() D ENDLN
 	. S SC=XMLWRITER.EndElement() D ENDLN
+	.
 	. ;
 	. ; DECLARANTLIST
 	. S SC=XMLWRITER.Element($P($T(@("T3")),U,2))
 	. D
 	.. ; SequenceNum
-	.. S SEQNR="00001"
+	.. S SEQNR="1"
 	.. S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,2),SEQNR)
-	.. ; DeclarantNum
-	.. S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,3),$E(BTWNR,3,999)_CTRLREF_SEQNR)
 	.. ; ClientNbr
 	.. S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,4),NBRCLIENT)
+	.. ; DeclarantNum
+	.. ; S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,3),$E(BTWNR,3,999)_CTRLREF_SEQNR)
+	.. S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,3),$E(BTWNR,3,999)_CTRLREF)
 	.. ; TurnOverSum
-	.. S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,5),$$CENT(TOTTURNOVER))
+	.. S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,5),TOTTURNOVER)
 	.. ; TaxSum
-	.. S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,6),$$CENT(TOTAMOUNT))
+	.. S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,6),TOTAMOUNT)
 	.. D ENDLN 
 	.. ;
 	.. ; COMPANY INFO
 	.. S SC=XMLWRITER.Element($P($T(@("T5")),U,2)) D ENDLN
 	.. D
 	... ; VATNum
-	... S SC=XMLWRITER.Element($P($T(@("T6")),U,2)),SC=XMLWRITER.WriteChars($E(BTWNR,3,999)),SC=XMLWRITER.EndElement() D ENDLN
+	... S SC=XMLWRITER.Element($P($T(@("T6")),U,2)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($E(BTWNR,3,999)),SC=XMLWRITER.EndElement() D ENDLN
 	... ; Name
-	... S SC=XMLWRITER.Element($P($T(@("T6")),U,3)),SC=XMLWRITER.WriteChars($E($P(B(1),D,2),1,32)),SC=XMLWRITER.EndElement() D ENDLN
+	... S SC=XMLWRITER.Element($P($T(@("T6")),U,3)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($E($P(B(1),D,2),1,32)),SC=XMLWRITER.EndElement() D ENDLN
 	... ; Street
-	... S SC=XMLWRITER.Element($P($T(@("T6")),U,4)),SC=XMLWRITER.WriteChars($E($P(B(1),D,3),1,24)),SC=XMLWRITER.EndElement() D ENDLN
+	... S SC=XMLWRITER.Element($P($T(@("T6")),U,4)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($E($P(B(1),D,3),1,24)),SC=XMLWRITER.EndElement() D ENDLN
 	... ; CityAndZipCode
-	... S SC=XMLWRITER.Element($P($T(@("T6")),U,5)),SC=XMLWRITER.WriteChars($E($P(B(1),D,IDINDEX),1,30)),SC=XMLWRITER.EndElement() D ENDLN
+	... S SC=XMLWRITER.Element($P($T(@("T6")),U,5)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars(POSTCODE),SC=XMLWRITER.EndElement() D ENDLN
+	... ; City
+	... S SC=XMLWRITER.Element($P($T(@("T6")),U,7)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($P($P(B(1),D,IDINDEX)," ",2,99)),SC=XMLWRITER.EndElement() D ENDLN
 	... ; Country
-	... S SC=XMLWRITER.Element($P($T(@("T6")),U,6)),SC=XMLWRITER.WriteChars($E(BTWNR,1,2)),SC=XMLWRITER.EndElement() D ENDLN
+	... S SC=XMLWRITER.Element($P($T(@("T6")),U,6)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($E(BTWNR,1,2)),SC=XMLWRITER.EndElement() D ENDLN
+	... ; E-mail
+	... S SC=XMLWRITER.Element($P($T(@("T6")),U,8)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($P(B(1),D,14)),SC=XMLWRITER.EndElement() D ENDLN
+	... ; Phone
+	... S SC=XMLWRITER.Element($P($T(@("T19")),U,6)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T17")),U,2)),SC=XMLWRITER.WriteChars($$DP^cAFA1($P(B(1),D,13))),SC=XMLWRITER.EndElement() D ENDLN
 	.. S SC=XMLWRITER.EndElement() D ENDLN
 	.. ;
 	.. ; PERIOD
@@ -221,17 +231,12 @@
 	; CLIENTLIST
 CLIENTB	S SC=XMLWRITER.Element($P($T(@("T8")),U,2))
 	S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,2),TEL) D ENDLN
-	; COMPANYINFO
-	S SC=XMLWRITER.Element($P($T(@("T10")),U,2)) D ENDLN
 	; VATNum
-	S SC=XMLWRITER.Element($P($T(@("T10")),U,3)),SC=XMLWRITER.WriteChars($E(BTW,3,999)),SC=XMLWRITER.EndElement() D ENDLN
-	; Country
-	S SC=XMLWRITER.Element($P($T(@("T10")),U,4)),SC=XMLWRITER.WriteChars($E(BTW,1,2)),SC=XMLWRITER.EndElement() D ENDLN
-	S SC=XMLWRITER.EndElement() D ENDLN
-	; Amount
-	S SC=XMLWRITER.Element($P($T(@("T11")),U,3)),SC=XMLWRITER.WriteChars($$CENT(A(2))),SC=XMLWRITER.EndElement() D ENDLN
+	S SC=XMLWRITER.Element($P($T(@("T10")),U,3)),SC=XMLWRITER.WriteAttribute($P($T(@("T10")),U,5),$E(BTW,1,2)),SC=XMLWRITER.WriteChars($E(BTW,3,999)),SC=XMLWRITER.EndElement() D ENDLN
 	; Turnover
-	S SC=XMLWRITER.Element($P($T(@("T11")),U,5)),SC=XMLWRITER.WriteChars($$CENT(A(1))),SC=XMLWRITER.EndElement() D ENDLN
+	S SC=XMLWRITER.Element($P($T(@("T11")),U,5)),SC=XMLWRITER.WriteChars(A(1)),SC=XMLWRITER.EndElement() D ENDLN
+	; Amount
+	S SC=XMLWRITER.Element($P($T(@("T11")),U,3)),SC=XMLWRITER.WriteChars(A(2)),SC=XMLWRITER.EndElement() D ENDLN
 	S SC=XMLWRITER.EndElement() D ENDLN
 	I '$G(SWVB) G CLIENTA
 	I $G(SWVB) G CLIENTAB
@@ -242,12 +247,6 @@
 ENDLN	S SC=XMLWRITER.WriteChars($C(13,10))
 ENDLNZ	Q
 	;
-CENT(EURO)	; Omzetten euro's naar eurocenten
-	N OUT,DEL
-	S EURO=$TR(EURO,",",".")
-	S OUT=EURO*100
-CENTZ	Q OUT
-	;
 R0	S $P(R,D,12)=$T(+0) D ^cAN1000 Q  ; v12 23.01.95
 	;
 SENDREF(JAAR)	
@@ -263,5 +262,4 @@
 	L -@("^"_Q_"BA(""%T"",13,""J"")")
 SENDREFZ	Q OUT
 	;
-ZZ	; 26.02.09 - 10 u 24 * V9.05
-
+ZZ	; 02.02.10 - 14 u 30 * V9.06