Index: cTN80401.mac.rou =================================================================== diff -u -r29059 -r43422 --- cTN80401.mac.rou (.../cTN80401.mac.rou) (revision 29059) +++ cTN80401.mac.rou (.../cTN80401.mac.rou) (revision 43422) @@ -9,35 +9,44 @@ VBZ Q ; T0 ;IC-opgave ; -T1 ;VatIntra;RecipientId;SenderId;ControlRef;MandataireId;SenderDate;VersionTech;Test; +T1 ;;RecipientId;SenderId;ControlRef;MandataireId;SenderDate;VersionTech;Test; T2 ;AgentRepr;DecNumber; -T3 ;DeclarantList; -T4 ;SequenceNum;DeclarantNum;ClientNbr;AmountSum; -T5 ;CompanyInfo; -T6 ;VATNum;Name;Street;CityAndZipCode;Country; -T7 ;Period; -T8 ;ClientList; +T3 ;IntraListing; +T4 ;SequenceNumber;DeclarantReference;ClientsNbr;AmountSum; +T5 ;Declarant; +T6 ;VATNumber;Name;Street;PostCode;CountryCode;City;EmailAddress; +T7 ;Period;Month;Quarter;Year; +T8 ;IntraClient; T9 ;SequenceNum; -T10 ;CompanyInfo;VATNum;Country; +T10 ;CompanyInfo;CompanyVATNumber;Country;issuedBy; T11 ;Period;Amount;Code; T12 ;Het pad voor de IC-kwartaalopgave is niet correct ingevuld.; T13 ;Kan het uniek nummer voor de opgave niet bepalen.; T15 ;De I.C.-kwartaalopgave is leeg; T16 ;Postcode niet gevonden, gelieve in te vullen bij parameters boekhouding.; +T17 ;IntraConsignment;IntraListingsNbr; +T18 ;http://www.minfin.fgov.be/InputCommon; +T19 ;E-mail ondertekenaar werd niet ingevuld.; +T20 ;Representative;RepresentativeID;issuedBy;identificationType;Phone; +T21 ;Telefoon ondertekenaar werd niet ingevuld.; ; T0F ;Relev� IC ; T12F ;Le chemin d�exportation du relev� IC �lectronique est incorrect.; T13F ;Impossible de d�finir le num�ro unique du relev� IC.; T15F ;Le relev� IC est vide; T16F ;Code postal pas trouv�, s.v.p. le remplir dans param. comptables.; +T19F ;E-mail signataire n'est pas rempli.; +T21F ;Telephone signataire n'est pas rempli.; ; T0E ;IC Statement ; T12E ;The path for the electronic IC Statement is not correct.; T13E ;Could not get unique number for the IC Statement.; T15E ;The IC Statement is empty; T16E ;Could not find the postal code. Please fill in at accounting param.; +T19E ;E-mail Signer was not filled in.; +T21E ;Telephone Signer was not filled in.; ; -1 N XMLFILE,BTWNR,MAND,CTRLREF,SEQNR,NBRCLIENT,TOTCLIENT,I3,I4,NODE,TEST,XMLPATH,B,UI1 +1 N XMLFILE,BTWNR,MAND,CTRLREF,SEQNR,NBRCLIENT,TOTCLIENT,I3,I4,NODE,TEST,XMLPATH,B,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(@("T15"_QT)),U,2) D:'$G(SWVB) TXT^cAFA1(250) G YZ +23 I 'NBRCLIENT S K=$P($T(@("T15"_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($P(BP1,"."),KW,MND) - 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(@("T16"_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(@("T16"_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(@("T21"_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(@("T19"_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,""K"")") 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 S XMLFILE=XMLFILE_$P(BP1,".") I '$G(SWTEST),'$L(MND) S XMLFILE=XMLFILE_"Q"_KW_".xml" @@ -113,86 +129,94 @@ 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(@("T17")),U,2)) + . S SC=XMLWRITER.WriteAttribute($P($T(@("T17")),U,3),"1") + . S SC=XMLWRITER.WriteAttribute("xmlns","http://www.minfin.fgov.be/IntraConsignment") . ; 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/VatIntra") - . S SC=XMLWRITER.WriteAttribute("xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance") - . ; S SC=XMLWRITER.WriteAttribute("xsi:noNamespaceSchemaLocation","http://minfin.fgov.be/portail1/nl/vatintra/VatIntra.xsd") - . ; S SC=XMLWRITER.WriteAttribute("xsi:schemaLocation","http://www.minfin.fgov.be/VatIntra file:http://minfin.fgov.be/portail1/fr/vatintra/VatIntra.xsd") - . ; S SC=XMLWRITER.WriteAttribute("xsi:schemaLocation","http://www.minfin.fgov.be/VatIntra \\data-m.be\dfs\mappen\Documenten\Klanten\TERBEK~1\Boekhouding\AANGIF~1\VatIntra.xsd") . D ENDLN . ; - . ; AGENTREPR - . S SC=XMLWRITER.Element($P($T(@("T2")),U,2)) + . ; Representative + . S SC=XMLWRITER.Element($P($T(@("T20")),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(@("T20")),U,3)),SC=XMLWRITER.WriteAttribute($P($T(@("T20")),U,4),"BE"),SC=XMLWRITER.WriteAttribute($P($T(@("T20")),U,5),"NVAT"),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T18")),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(@("T18")),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(@("T18")),U,2)),SC=XMLWRITER.WriteChars($E($P(B(1),D,3),1,24)),SC=XMLWRITER.EndElement() D ENDLN + .. ; Postcode + .. S SC=XMLWRITER.Element($P($T(@("T6")),U,5)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T18")),U,2)),SC=XMLWRITER.WriteChars(POSTCODE),SC=XMLWRITER.EndElement() D ENDLN + .. ; City + .. ; CityAndZipCode + .. S SC=XMLWRITER.Element($P($T(@("T6")),U,7)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T18")),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(@("T18")),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(@("T18")),U,2)),SC=XMLWRITER.WriteChars($P(B(1),D,14)),SC=XMLWRITER.EndElement() D ENDLN + .. ; Phone + .. S SC=XMLWRITER.Element($P($T(@("T20")),U,6)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T18")),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) .. ; AmountSum - .. S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,5),$$CENT(TOTCLIENT)) + .. S SC=XMLWRITER.WriteAttribute($P($T(@("T4")),U,5),TOTCLIENT) .. 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(@("T18")),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(@("T18")),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(@("T18")),U,2)),SC=XMLWRITER.WriteChars($E($P(B(1),D,3),1,24)),SC=XMLWRITER.EndElement() D ENDLN + ... ; Postcode + ... S SC=XMLWRITER.Element($P($T(@("T6")),U,5)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T18")),U,2)),SC=XMLWRITER.WriteChars(POSTCODE),SC=XMLWRITER.EndElement() D ENDLN + ... ; City ... ; 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,7)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T18")),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(@("T18")),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(@("T18")),U,2)),SC=XMLWRITER.WriteChars($P(B(1),D,14)),SC=XMLWRITER.EndElement() D ENDLN + ... ; Phone + ... S SC=XMLWRITER.Element($P($T(@("T20")),U,6)),SC=XMLWRITER.WriteAttribute("xmlns",$P($T(@("T18")),U,2)),SC=XMLWRITER.WriteChars($$DP^cAFA1($P(B(1),D,13))),SC=XMLWRITER.EndElement() D ENDLN .. S SC=XMLWRITER.EndElement() D ENDLN .. ; .. ; PERIOD - .. S SC=XMLWRITER.Element($P($T(@("T7")),U,2)),SC=XMLWRITER.WriteChars($S($L(MND):$P(BP1,".",2)_$P(BP1,"."),1:$S($$DC^cAFD1(DT)'<20100205:"3",1:"")_KW_$P(BP1,"."))),SC=XMLWRITER.EndElement() D ENDLN + .. S SC=XMLWRITER.Element($P($T(@("T7")),U,2)) D ENDLN + .. I $L(MND) D + ... S SC=XMLWRITER.Element($P($T(@("T7")),U,3)) + ... S SC=XMLWRITER.WriteChars($P(BP1,".",2)),SC=XMLWRITER.EndElement() D ENDLN + ... S SC=XMLWRITER.Element($P($T(@("T7")),U,5)) + ... S SC=XMLWRITER.WriteChars($P(BP1,".")),SC=XMLWRITER.EndElement() D ENDLN + ... ; S SC=XMLWRITER.WriteChars($S($L(MND):$P(BP1,".",2)_$P(BP1,"."),1:$S($$DC^cAFD1(DT)'<20100205:"3",1:"")_KW_$P(BP1,"."))) + .. I '$L(MND) D + ... S SC=XMLWRITER.Element($P($T(@("T7")),U,4)) + ... S SC=XMLWRITER.WriteChars(KW),SC=XMLWRITER.EndElement() D ENDLN + ... S SC=XMLWRITER.Element($P($T(@("T7")),U,5)) + ... S SC=XMLWRITER.WriteChars($P(BP1,".")),SC=XMLWRITER.EndElement() D ENDLN + .. S SC=XMLWRITER.EndElement() D ENDLN .. ; .. D CLIENT . S SC=XMLWRITER.EndElement() D ENDLN @@ -223,18 +247,13 @@ ; 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(BTW),SC=XMLWRITER.EndElement() D ENDLN - ; Country - S SC=XMLWRITER.Element($P($T(@("T10")),U,4)),SC=XMLWRITER.WriteChars($E(I3,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(BE)),SC=XMLWRITER.EndElement() D ENDLN + S SC=XMLWRITER.Element($P($T(@("T10")),U,3)),SC=XMLWRITER.WriteAttribute($P($T(@("T10")),U,5),$E(I3,1,2)),SC=XMLWRITER.WriteChars(BTW),SC=XMLWRITER.EndElement() D ENDLN ; Code ; I $$DC^cAFD1(DT)'<20100205 S SC=XMLWRITER.Element($P($T(@("T11")),U,4)),SC=XMLWRITER.WriteChars(CODE),SC=XMLWRITER.EndElement() D ENDLN I BP1>2010 S SC=XMLWRITER.Element($P($T(@("T11")),U,4)),SC=XMLWRITER.WriteChars(CODE),SC=XMLWRITER.EndElement() D ENDLN + ; Amount + S SC=XMLWRITER.Element($P($T(@("T11")),U,3)),SC=XMLWRITER.WriteChars(BE),SC=XMLWRITER.EndElement() D ENDLN S SC=XMLWRITER.EndElement() D ENDLN ; I BTW?1."0" S KC=$O(^TEMP(boot,$J,I3,KC)) I KC S BE=$P(^(KC),D) G CLIENTB I '$G(SWVB) G CLIENTA @@ -244,13 +263,8 @@ ;--------------------------------------------------------------------------------------------------------------------------- ; 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,KW,MAAND) @@ -268,5 +282,4 @@ L -@("^"_Q_"BA(""%T"",13,""K"")") SENDREFZ Q OUT ; -ZZ ; 16.10.08 - 14 u 11 * V9.04 - +ZZ ; 02.02.10 - 14 u 30 * V9.06