Index: FaxMail2.mac.rou =================================================================== diff -u -r921 -r948 --- FaxMail2.mac.rou (.../FaxMail2.mac.rou) (revision 921) +++ FaxMail2.mac.rou (.../FaxMail2.mac.rou) (revision 948) @@ -142,12 +142,7 @@ Merge Data=DefData ; De default data copieren Merge DocNum=ORDNr,Data("DocNum")=ORDNr,OPData=Data Set R=^KO1(ORDNr,"F"),KLNr=$P(R,D),R=^KOD(KLNr,"F",ORDNr,1),OrdRef=$P(R,D,3),(MailTav,Tav,DefFax)=$P($P(R,D,9),"#"),FaxNrOrEmail=$P(R,D,10) - Set TextId=$G(TextId) - Do:TextId="" - . New IsConsument,VerzendWijze - . Set IsConsument=$P(^KKL(^KK1(KLNr),1),D,11)="Consument" - . Set VerzendWijze=$P($P($$DEFAULT^KLVERZW(,KLNr,ORDNr),"`"),";") - . Set TextId=$$TSELECT^DCFAX() + Set TextId=$G(TextId) Set:TextId="" TextId=$$TSELECT^DCFAX() Do:$L(TextId) . Do INIT^FaxMail("N"),FaxINIT^FaxMail(),KlINIT^FaxMail(KLNr,.Data) . Set Taal=Data("Taal") @@ -467,7 +462,8 @@ . Do:$P(^KKL(^KK1(KLNr),1),D,17)["F" . . Set IntVw=$$INTVW^KLOPV(KLNr) . . Set:IntVw DefData("VanUser")=IntVw,DefData("Van")=$$USERNAME^vhUSER(IntVw,2) - . . Set DefData("TextId")="S",DefData("BackGround")=1 + . . Set DefData("TextId")=$S($$CheckConsument^FLOWBON5(DocNum,1):"CLA",$$CheckConsument^FLOWBON5(DocNum):"CLV",1:"S") + . . Set DefData("BackGround")=1 . . Do LEVERBON(.DocNum,.TextId,"Fax",.DefData) . . Do:$P(^KKL(^KK1(KLNr),1),D,17)["M" @@ -488,7 +484,8 @@ . . . Set $E(ToMail)="" . . . Set ToMail=$$USERNAME^vhUSER(ToMail,"@") . . Quit:ToMail="" - . . Set DefData("TextId")="S",DefData("em")=ToMail,DefData("BackGround")=1,DefData("Van")="info@vanhoecke.be" + . . Set DefData("TextId")=$S($$CheckConsument^FLOWBON5(DocNum,1):"CLA",$$CheckConsument^FLOWBON5(DocNum):"CLV",1:"S") + . . Set DefData("em")=ToMail,DefData("BackGround")=1,DefData("Van")="info@vanhoecke.be" . . Do LEVERBON(.DocNum,.TextId,"Mail",.DefData) Quit \ No newline at end of file