Index: EWBON.mac.rou =================================================================== diff -u -r51507 -r51779 --- EWBON.mac.rou (.../EWBON.mac.rou) (revision 51507) +++ EWBON.mac.rou (.../EWBON.mac.rou) (revision 51779) @@ -110,6 +110,9 @@ Set DocumentReferentiesID = $P(R,D,57) Set SalesIdAX = $Piece(R,D,58) #dim Oorsprong As BL.Flow.Offerte.enu.Oorsprong = $P(R,D,53) + #dim IsTekstlijn As %Boolean + #dim OLSubscript As %String = "" + Set OLLijst = ##class(%ListOfDataTypes).%New() Set R="" Set $P(R,D,4)=IntPers,$P(R,D,5)=ORDNr_" - "_OrdDat_" - "_OrdRef Set $P(R,D,17)="KF5",$P(R,D,19)=KlasRef,$P(R,D,20)=OrgalRef,$P(R,D,21)=EDINummer,$P(R,D,22)=VHisieVwCust,$P(R,D,26)="" @@ -118,17 +121,20 @@ Set $Piece(R,D,29) = SalesIdAX Set ULNr=$$NEXTULNR(KLNr,CONSNr),^KUL(KLNr,"F",CONSNr,ULNr)=R Do BUILDBON^FLOWBON3(KLNr,CONSNr,ULNr),BUILDKUP^FLOWBON3(KLNr,CONSNr,ULNr) - ; Copieren van tekst- en manuele lijnen vooraan in het order Set OLNr=99 For Set OLNr=$O(^KOD(KLNr,"F",ORDNr,OLNr)) Quit:OLNr="" Do Quit:PRNr . Set R=^KOD(KLNr,"F",ORDNr,OLNr),PRNr=$P(R,D,2) . Quit:PRNr . If $P($P(R,D,17),"#")="KF1925",$P($P(R,D,17),"#",3) Set ComTegKom=R Quit ; Manuele lijn met commerciele korting moet blijven zitten + . Set IsTekstlijn = $$$False . Set ULNr=$$NEXTULNR(KLNr,CONSNr),$P(R,D,15)="" . Set $P(R,D,41,42)=D,^KUL(KLNr,"F",CONSNr,ULNr)=R . Do BUILDBON^FLOWBON3(KLNr,CONSNr,ULNr),BUILDKUP^FLOWBON3(KLNr,CONSNr,ULNr) - . Kill ^KOD(KLNr,"F",ORDNr,OLNr) + . Set IsTekstlijn=##class(TECH.StringUtils).StartsWith($P(R,"\",17),"KF11#") + . If $$$Not(IsTekstlijn) Set IsTekstlijn=##class(TECH.StringUtils).StartsWith($P(R,"\",18),"T") + . If 'IsTekstlijn Kill ^KOD(KLNr,"F",ORDNr,OLNr) + . If IsTekstlijn Set OLSubscript=KLNr_",""F"","_ORDNr_","_OLNr Do OLLijst.Insert(OLSubscript) Set (OLUNr,ComTegKom)="" For Set OLUNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr)) Quit:OLUNr="" Do @@ -161,6 +167,8 @@ .For Set OLNr=$O(^KOD(KLNr,"F",ORDNr,OLNr)) Quit:OLNr=TOLNr Do ..Set R=^KOD(KLNr,"F",ORDNr,OLNr),PRNr=$P(R,D,2) ..If $P($P(R,D,17),"#")="KF1925",$P($P(R,D,17),"#",3) Set ComTegKom=R Quit ; Manuele lijn met commerciele korting moet blijven zitten + ..Set OLSubscript = KLNr_",""F"","_ORDNr_","_OLNr + ..Quit:(##class(TECH.ListUtils).Contains(OLLijst,OLSubscript)) ..Set ULNr=$$NEXTULNR(KLNr,CONSNr),$P(R,D,15)="" ..Set $P(R,D,41,42)=$S($P(R,D,2):$$PICKDETAILLevering(CONSNr,ORDNr,OLUNr),1:D),^KUL(KLNr,"F",CONSNr,ULNr)=R ..Do BUILDBON^FLOWBON3(KLNr,CONSNr,ULNr),BUILDKUP^FLOWBON3(KLNr,CONSNr,ULNr)