Index: vhTest/Fake/BL/Legacy/TRANSP/LeverbonService.cls.xml
===================================================================
diff -u
--- vhTest/Fake/BL/Legacy/TRANSP/LeverbonService.cls.xml	(revision 0)
+++ vhTest/Fake/BL/Legacy/TRANSP/LeverbonService.cls.xml	(revision 57626)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.BL.Legacy.TRANSP.LeverbonService">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>BL.Legacy.TRANSP.LeverbonService</Super>
+
+<Method name="HeeftBonMetRembours">
+<FormalSpec>SalesIdAX:%String,KlantNr:%String=""</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="ZetRemboursBedragVoorBon">
+<FormalSpec>BONNr:%String,KlantNr:%String,RemboursBedrag:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/BL/Legacy/TRANSP/Test.cls.xml
===================================================================
diff -u -r55587 -r57626
--- vhUnitTest/BL/Legacy/TRANSP/Test.cls.xml	(.../Test.cls.xml)	(revision 55587)
+++ vhUnitTest/BL/Legacy/TRANSP/Test.cls.xml	(.../Test.cls.xml)	(revision 57626)
@@ -59,11 +59,11 @@
 	Do InvoiceAmountServiceMock.VerwachtMethodCall("GeefFactuurBedragen","SalesId1").DanReturn(Return1)
 	Do InvoiceAmountServiceMock.VerwachtMethodCall("GeefFactuurBedragen","SalesId2").DanReturn(Return2)
 	
-	Set OrderOpBonBepalerMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.OrderOpBonBepaler).%New()
-	Do OrderOpBonBepalerMock.VerwachtMethodCall("HeeftOrderlijnenOpTransport","SalesId1","").DanReturn($$$False)
-	Do OrderOpBonBepalerMock.VerwachtMethodCall("HeeftOrderlijnenOpTransport","SalesId2","").DanReturn($$$False)
+	Set LeverbonServiceMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.LeverbonService).%New()
+	Do LeverbonServiceMock.VerwachtMethodCall("HeeftBonMetRembours","SalesId1","").DanReturn($$$False)
+	Do LeverbonServiceMock.VerwachtMethodCall("HeeftBonMetRembours","SalesId2","").DanReturn($$$False)
 	
-	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock,,OrderOpBonBepalerMock)
+	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock,,LeverbonServiceMock)
 	
 	Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),33.3)	
 	
@@ -72,7 +72,7 @@
 	Do OrderVerwijzingLijnMock1.Verifieer()
 	Do OrderVerwijzingLijnMock2.Verifieer()
 	Do InvoiceAmountServiceMock.Verifieer()
-	Do OrderOpBonBepalerMock.Verifieer()
+	Do LeverbonServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -96,10 +96,10 @@
 	#dim Return1 as AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC = ..GeefVHInvoiceAmountOutputDC(12.1,2.1,1.5)
 	Do InvoiceAmountServiceMock.VerwachtMethodCall("GeefFactuurBedragen","SalesId1").DanReturn(Return1)
 	
-	Set OrderOpBonBepalerMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.OrderOpBonBepaler).%New()
-	Do OrderOpBonBepalerMock.VerwachtMethodCall("HeeftOrderlijnenOpTransport","SalesId1","").DanReturn($$$False)
-	Do OrderOpBonBepalerMock.VerwachtMethodCall("HeeftOrderlijnenOpTransport","SalesId2","").DanReturn($$$True)
-	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock,,OrderOpBonBepalerMock)
+	Set LeverbonServiceMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.LeverbonService).%New()
+	Do LeverbonServiceMock.VerwachtMethodCall("HeeftBonMetRembours","SalesId1","").DanReturn($$$False)
+	Do LeverbonServiceMock.VerwachtMethodCall("HeeftBonMetRembours","SalesId2","").DanReturn($$$True)
+	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock,,LeverbonServiceMock)
 
 	Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),10.6)	
 	
@@ -108,7 +108,7 @@
 	Do OrderVerwijzingLijnMock1.Verifieer()
 	Do OrderVerwijzingLijnMock2.Verifieer()
 	Do InvoiceAmountServiceMock.Verifieer()
-	Do OrderOpBonBepalerMock.Verifieer()
+	Do LeverbonServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -156,11 +156,11 @@
 	Set WSException = ##class(TECH.Exceptions.GeneralErrorException).%New("WebserviceException")
 	Do InvoiceAmountServiceMock.IndienMethodCall("GeefFactuurBedragen","SalesId2").DanException(WSException)
 	
-	Set OrderOpBonBepalerMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.OrderOpBonBepaler).%New()
-	Do OrderOpBonBepalerMock.VerwachtMethodCall("HeeftOrderlijnenOpTransport","SalesId1","").DanReturn($$$False)
-	Do OrderOpBonBepalerMock.VerwachtMethodCall("HeeftOrderlijnenOpTransport","SalesId2","").DanReturn($$$False)
+	Set LeverbonServiceMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.LeverbonService).%New()
+	Do LeverbonServiceMock.VerwachtMethodCall("HeeftBonMetRembours","SalesId1","").DanReturn($$$False)
+	Do LeverbonServiceMock.VerwachtMethodCall("HeeftBonMetRembours","SalesId2","").DanReturn($$$False)
 
-	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock,,OrderOpBonBepalerMock)
+	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock,,LeverbonServiceMock)
 	
 	Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),11.1)	
 	
@@ -169,7 +169,7 @@
 	Do OrderVerwijzingLijnMock1.Verifieer()
 	Do OrderVerwijzingLijnMock2.Verifieer()
 	Do InvoiceAmountServiceMock.Verifieer()
-	Do OrderOpBonBepalerMock.Verifieer()
+	Do LeverbonServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -195,11 +195,11 @@
 	#dim Return2 as AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC = ..GeefVHInvoiceAmountOutputDC(12.1,2.1,1)
 	Do InvoiceAmountServiceMock.VerwachtMethodCall("GeefFactuurBedragen","SalesId2").DanReturn(Return2)
 
-	Set OrderOpBonBepalerMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.OrderOpBonBepaler).%New()
-	Do OrderOpBonBepalerMock.VerwachtMethodCall("HeeftOrderlijnenOpTransport","SalesId1","").DanReturn($$$False)
-	Do OrderOpBonBepalerMock.VerwachtMethodCall("HeeftOrderlijnenOpTransport","SalesId2","").DanReturn($$$False)
+	Set LeverbonServiceMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.LeverbonService).%New()
+	Do LeverbonServiceMock.VerwachtMethodCall("HeeftBonMetRembours","SalesId1","").DanReturn($$$False)
+	Do LeverbonServiceMock.VerwachtMethodCall("HeeftBonMetRembours","SalesId2","").DanReturn($$$False)
 	
-	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock,,OrderOpBonBepalerMock)
+	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock,,LeverbonServiceMock)
 	
 	Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),11.1)	
 	
@@ -208,7 +208,7 @@
 	Do OrderVerwijzingLijnMock1.Verifieer()
 	Do OrderVerwijzingLijnMock2.Verifieer()
 	Do InvoiceAmountServiceMock.Verifieer()
-	Do OrderOpBonBepalerMock.Verifieer()
+	Do LeverbonServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -233,22 +233,35 @@
 	Do InvoiceAmountServiceMock.IndienMethodCall("GeefFactuurBedragen","SalesId1").DanException(WSException)
 	Do InvoiceAmountServiceMock.IndienMethodCall("GeefFactuurBedragen","SalesId2").DanException(WSException)
 	
-	Set OrderOpBonBepalerMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.OrderOpBonBepaler).%New()
-	Do OrderOpBonBepalerMock.VerwachtMethodCall("HeeftOrderlijnenOpTransport","SalesId1","").DanReturn($$$False)
-	Do OrderOpBonBepalerMock.VerwachtMethodCall("HeeftOrderlijnenOpTransport","SalesId2","").DanReturn($$$False)
+	Set LeverbonServiceMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.LeverbonService).%New()
+	Do LeverbonServiceMock.VerwachtMethodCall("HeeftBonMetRembours","SalesId1","").DanReturn($$$False)
+	Do LeverbonServiceMock.VerwachtMethodCall("HeeftBonMetRembours","SalesId2","").DanReturn($$$False)
 
-	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock,,OrderOpBonBepalerMock)
+	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock,,LeverbonServiceMock)
 	
 	Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),0)	
 	
 	Do OrderAPIMock.Verifieer()
 	Do BonMock.Verifieer()
 	Do OrderVerwijzingLijnMock1.Verifieer()
 	Do OrderVerwijzingLijnMock2.Verifieer()
-	Do OrderOpBonBepalerMock.Verifieer()
+	Do LeverbonServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Zet rembours op leverbon">
+<Implementation><![CDATA[
+	Set LeverbonServiceMock = ##class(vhTest.Mock.BL.Legacy.TRANSP.LeverbonService).%New()
+	Do LeverbonServiceMock.VerwachtMethodCall("ZetRemboursBedragVoorBon","BONNR","KLANTNR",60.59).ExactAantalKeer(1).DanDoeNiks()
+
+	Set TRANSP = ##class(BL.Legacy.TRANSP).%New(,,,LeverbonServiceMock)
+	
+	Do TRANSP.ZetRemboursBedragVoorBon("BONNR","KLANTNR",60.59)
+	
+	Do LeverbonServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test geeft 0 terug indien bon niet bestaat">
 <Implementation><![CDATA[
 	#dim OrderAPIMock as vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance()
Index: vhTest/Mock/BL/Legacy/TRANSP/LeverbonService.cls.xml
===================================================================
diff -u
--- vhTest/Mock/BL/Legacy/TRANSP/LeverbonService.cls.xml	(revision 0)
+++ vhTest/Mock/BL/Legacy/TRANSP/LeverbonService.cls.xml	(revision 57626)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.BL.Legacy.TRANSP.LeverbonService">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>BL.Legacy.TRANSP.LeverbonService,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="%OnNew">
+<FormalSpec>KUL:%String="^KUL"</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HeeftBonMetRembours">
+<FormalSpec>SalesIdAX:%String,KlantNr:%String=""</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("HeeftBonMetRembours",SalesIdAX,KlantNr)
+]]></Implementation>
+</Method>
+
+<Method name="ZetRemboursBedragVoorBon">
+<FormalSpec>ConsolidatieNr:%String,KlantNr:%String,RemboursBedrag:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetRemboursBedragVoorBon",ConsolidatieNr,KlantNr,RemboursBedrag)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TRANSP.mac.rou
===================================================================
diff -u -r55587 -r57626
--- TRANSP.mac.rou	(.../TRANSP.mac.rou)	(revision 55587)
+++ TRANSP.mac.rou	(.../TRANSP.mac.rou)	(revision 57626)
@@ -102,7 +102,7 @@
  Quit
  ;
 INITGRP 
- New R,Rembours,Rembours,Gewicht,ColTyp,Omschr,Count,BONNr,Node,BarCode,OphVoorz
+ New R,Rembours,Rembours,Gewicht,ColTyp,Omschr,Count,BONNr,Node,BarCode,OphVoorz,RemboursVoorBon, LegacyTRANSP
  Set R=^KU1(GroepNr,"F"),KLNr=$P(R,D),Node=$$NODE(GroepNr)
  Set R=$G(^KUL(KLNr,Node,GroepNr,3))
  If $$IsBonMetEnkelVerwijzingNaarLeveradres(R) Set R = ^KKL(^KK1(KLNr),"L"_##class(TECH.StringUtils).AlignRight($P(R,D)," ",3))
@@ -113,7 +113,12 @@
  .Set (BONNr,Rembours,Gewicht)=""
  .For  Set BONNr=$O(Bons("BON",BONNr)) Quit:BONNr=""  Do
  ..Set Node=$$NODE(BONNr)
- ..Set Rembours=Rembours+$S($$ISREMB^REMBOURS(KLNr,BONNr):##class(BL.Legacy.TRANSP).%New().GeefRemboursBedragVoorBon(BONNr,KLNr),1:"")
+ ..If ($$ISREMB^REMBOURS(KLNr,BONNr))  Do
+ ...Set LegacyTRANSP = ##class(BL.Legacy.TRANSP).%New()
+ ...Do LegacyTRANSP.ZetRemboursBedragVoorBon(BONNr,KLNr,"") 
+ ...Set RemboursVoorBon = LegacyTRANSP.GeefRemboursBedragVoorBon(BONNr,KLNr)
+ ...Do:(RemboursVoorBon>0) LegacyTRANSP.ZetRemboursBedragVoorBon(BONNr,KLNr,RemboursVoorBon) 
+ ...Set Rembours=Rembours+RemboursVoorBon
  ..Set R=^KUL(KLNr,Node,BONNr,1),Gewicht=Gewicht+$J($P($P(R,D,13),"#",3),0,1)
  .Set sFL(1)=KLNr_D_Rembours_D_Gewicht,$P(sFL(1),D,9)=$$DEVUSER^vhUSER(),$P(sFL(1),D,10)=$H
  Set sFL("V")=$G(^TRANSP("D",VervRef))
@@ -164,6 +169,7 @@
  For  Set BONNr=$O(^TRANSP("D",VervRef,"D",GroepNr,"B",BONNr)) Quit:BONNr=""  Do
  .Set KLNr=$P(^KU1(BONNr,"F"),D),Node=$$NODE(BONNr)
  .Set R=^KUL(KLNr,Node,BONNr,1),$P(R,D,8)="",^KUL(KLNr,Node,BONNr,1)=R
+ .Do ##class(BL.Legacy.TRANSP).%New().ZetRemboursBedragVoorBon(BONNr,KLNr,"")
  .Set Gewicht=Gewicht+$J($P($P(R,D,13),"#",3),0,1)
  .Do:BONNr'=GroepNr VERW^LOG("TRP",VervRef,"B"_BONNr)
  Kill ^TRANSP("D",VervRef,"D",GroepNr)
@@ -278,7 +284,7 @@
  Quit
  ;
 MODBONS 
- New R,BONNr,Count,Rembours,Gewicht,TempBons,TempColList
+ New R,BONNr,Count,Rembours,Gewicht,TempBons,TempColList,RemboursVoorBon,LegacyTRANSP
  Merge TempBons=Bons,TempColList=ColList
  Do SELBON($NAME(Bons))
  Do:'$D(Bons("ANUL"))
@@ -293,7 +299,12 @@
  .Set (BONNr,Rembours,Gewicht)=""
  .For  Set BONNr=$O(Bons("BON",BONNr)) Quit:BONNr=""  Do
  ..Set Node=$$NODE(BONNr)
- ..Set Rembours=Rembours+$S($$ISREMB^REMBOURS(KLNr,BONNr):##class(BL.Legacy.TRANSP).%New().GeefRemboursBedragVoorBon(BONNr,KLNr),1:"")
+ ..If ($$ISREMB^REMBOURS(KLNr,BONNr))  Do
+ ...Set LegacyTRANSP = ##class(BL.Legacy.TRANSP).%New()
+ ...Do LegacyTRANSP.ZetRemboursBedragVoorBon(BONNr,KLNr,"") 
+ ...Set RemboursVoorBon = LegacyTRANSP.GeefRemboursBedragVoorBon(BONNr,KLNr)
+ ...Do:(RemboursVoorBon>0) LegacyTRANSP.ZetRemboursBedragVoorBon(BONNr,KLNr,RemboursVoorBon) 
+ ...Set Rembours=Rembours+RemboursVoorBon
  ..Set R=^KUL(KLNr,Node,BONNr,1),Gewicht=Gewicht+$J($P($P(R,D,13),"#",3),0,1)
  .If Rembours>0,'##class(CHUI.Flow.Cons.Transport).CheckMaximumRembours(VervRef,GroepNr,Rembours,1) Kill Bons Merge Bons=TempBons,ColList=TempColList Quit
  .Do:$P(sFL(1),D,2,3)'=(Rembours_D_Gewicht)
Index: vhUnitTest/BL/Legacy/TRANSP/LeverbonService/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/BL/Legacy/TRANSP/LeverbonService/Test.cls.xml	(revision 0)
+++ vhUnitTest/BL/Legacy/TRANSP/LeverbonService/Test.cls.xml	(revision 57626)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.BL.Legacy.TRANSP.LeverbonService.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Order heeft een bon met rembours">
+<Implementation><![CDATA[
+	#dim KULTemp As %String = "KULTemp"
+	
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",61) = "120.85"
+	
+	Set LeverbonService = ##class(BL.Legacy.TRANSP.LeverbonService).%New(KULTemp)
+	#dim HeeftBonMetRembours As %Boolean = LeverbonService.HeeftBonMetRembours("SalesIdAX","KlantNr")
+
+	kill @KULTemp
+	
+	Do $$$AssertTrue(HeeftBonMetRembours)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Order heeft geen bon met rembours">
+<Implementation><![CDATA[
+	#dim KULTemp As %String = "KULTemp"
+	
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",61) = ""
+	
+	Set LeverbonService = ##class(BL.Legacy.TRANSP.LeverbonService).%New(KULTemp)
+	#dim HeeftBonMetRembours As %Boolean = LeverbonService.HeeftBonMetRembours("SalesIdAX","KlantNr")
+
+	kill @KULTemp
+	
+	Do $$$AssertFalse(HeeftBonMetRembours)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Gesplitst order heeft bonnen waarvan één met rembours">
+<Implementation><![CDATA[
+	#dim KULTemp As %String = "KULTemp"
+	
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",61) = ""
+
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",58) = "SalesIdAX"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",61) = "120.85"
+	
+	Set LeverbonService = ##class(BL.Legacy.TRANSP.LeverbonService).%New(KULTemp)
+	#dim HeeftBonMetRembours As %Boolean = LeverbonService.HeeftBonMetRembours("SalesIdAX","KlantNr")
+
+	kill @KULTemp
+	
+	Do $$$AssertTrue(HeeftBonMetRembours)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Gesplitst order heeft bonnen zonder rembours">
+<Implementation><![CDATA[
+	#dim KULTemp As %String = "KULTemp"
+	
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",61) = ""
+
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",58) = "SalesIdAX"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",61) = ""
+	
+	Set LeverbonService = ##class(BL.Legacy.TRANSP.LeverbonService).%New(KULTemp)
+	#dim HeeftBonMetRembours As %Boolean = LeverbonService.HeeftBonMetRembours("SalesIdAX","KlantNr")
+
+	kill @KULTemp
+	
+	Do $$$AssertFalse(HeeftBonMetRembours)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Gesplitst order heeft geen bonnen met rembours van dezelfde SalesIdAX">
+<Implementation><![CDATA[
+	#dim KULTemp As %String = "KULTemp"
+	
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",61) = ""
+
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",58) = "Andere SalesIdAX"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr2",1),"\",61) = "120.85"
+
+	Set LeverbonService = ##class(BL.Legacy.TRANSP.LeverbonService).%New(KULTemp)
+	#dim HeeftBonMetRembours As %Boolean = LeverbonService.HeeftBonMetRembours("SalesIdAX","KlantNr")
+
+	kill @KULTemp
+	
+	Do $$$AssertFalse(HeeftBonMetRembours)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Zet rembours op leverbon">
+<Implementation><![CDATA[
+	#dim KULTemp As %String = "KULTemp"
+	
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",58) = "SalesIdAX"
+	Set $P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",61) = ""
+
+	Set LeverbonService = ##class(BL.Legacy.TRANSP.LeverbonService).%New(KULTemp)
+	Do LeverbonService.ZetRemboursBedragVoorBon("ConsolidatieNr1","KlantNr",60.59)
+
+	Do $$$AssertEquals($P(@KULTemp@("KlantNr","F","ConsolidatieNr1",1),"\",61),60.59)
+
+	kill @KULTemp
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TRANSPX.mac.rou
===================================================================
diff -u -r55587 -r57626
--- TRANSPX.mac.rou	(.../TRANSPX.mac.rou)	(revision 55587)
+++ TRANSPX.mac.rou	(.../TRANSPX.mac.rou)	(revision 57626)
@@ -57,7 +57,11 @@
  . Set sFL(1)=KLNr,$P(sFL(1),D,9)=$$DEVUSER^vhUSER(),$P(sFL(1),D,10)=$H
  Else  Set KLNr=$P(sFL(1),D)
  Do:'$D(^TRANSP("D",VervRef,"D",GroepNr,"B",BONNr))
- . Set Rembours=$S($$ISREMB^REMBOURS(KLNr,BONNr):##class(BL.Legacy.TRANSP).%New().GeefRemboursBedragVoorBon(BONNr,KLNr),1:"")
+ .If ($$ISREMB^REMBOURS(KLNr,BONNr))  Do
+ ..Set LegacyTRANSP = ##class(BL.Legacy.TRANSP).%New()
+ ..Do LegacyTRANSP.ZetRemboursBedragVoorBon(BONNr,KLNr,"") 
+ ..Set Rembours = LegacyTRANSP.GeefRemboursBedragVoorBon(BONNr,KLNr)
+ ..Do:(Rembours>0) LegacyTRANSP.ZetRemboursBedragVoorBon(BONNr,KLNr,Rembours) 
  . Set Node=$$NODE(BONNr),R=^KUL(KLNr,Node,BONNr,1),Gewicht=$J($P($P(R,D,13),"#",3),0,1)
  . Set $P(sFL("V"),D,3)=$P(sFL("V"),D,3)+Gewicht
  . Set $P(sFL(1),D,2)=$P(sFL(1),D,2)+Rembours
Index: BL/Legacy/TRANSP.cls.xml
===================================================================
diff -u -r55587 -r57626
--- BL/Legacy/TRANSP.cls.xml	(.../TRANSP.cls.xml)	(revision 55587)
+++ BL/Legacy/TRANSP.cls.xml	(.../TRANSP.cls.xml)	(revision 57626)
@@ -18,13 +18,13 @@
 <Private>1</Private>
 </Property>
 
-<Property name="OrderOpBonBepaler">
-<Type>BL.Legacy.TRANSP.OrderOpBonBepaler</Type>
+<Property name="LeverbonService">
+<Type>BL.Legacy.TRANSP.LeverbonService</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>OrderAPI:DOM.VKP.OrderAPI="",InvoiceAmountService:AXimpl.Dynamics.InvoiceAmountOut.InvoiceAmountService="",Logger:vhLib.Logger="",OrderOpBonBepaler:BL.Legacy.TRANSP.OrderOpBonBepaler=""</FormalSpec>
+<FormalSpec>OrderAPI:DOM.VKP.OrderAPI="",InvoiceAmountService:AXimpl.Dynamics.InvoiceAmountOut.InvoiceAmountService="",Logger:vhLib.Logger="",LeverbonService:BL.Legacy.TRANSP.LeverbonService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -33,7 +33,7 @@
 	Set ..OrderAPI = $$$Inject(OrderAPI,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
 	Set ..InvoiceAmountService = $$$Inject(InvoiceAmountService,##class(AXimpl.Dynamics.InvoiceAmountOut.InvoiceAmountService).%New())
 	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
-	Set ..OrderOpBonBepaler = $$$Inject(OrderOpBonBepaler, ##class(BL.Legacy.TRANSP.OrderOpBonBepaler).%New())
+	Set ..LeverbonService = $$$Inject(LeverbonService, ##class(BL.Legacy.TRANSP.LeverbonService).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -76,6 +76,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetRemboursBedragVoorBon">
+<FormalSpec>BONNr:%String,KlantNr:%String,RemboursBedrag:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..LeverbonService.ZetRemboursBedragVoorBon(BONNr, KlantNr, RemboursBedrag)
+]]></Implementation>
+</Method>
+
 <Method name="GeefFactuurBedragMetKortingContantVerrekend">
 <FormalSpec>VHInvoiceAmountOutputDC:AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC</FormalSpec>
 <Private>1</Private>
@@ -87,7 +93,7 @@
 <Method name="RemboursbedragStaatReedsOpBon">
 <FormalSpec>SalesIdAX:%String,KlantNr:%String=""</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..OrderOpBonBepaler.HeeftOrderlijnenOpTransport(SalesIdAX, KlantNr)
+<Implementation><![CDATA[	Quit ..LeverbonService.HeeftBonMetRembours(SalesIdAX, KlantNr)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/AXimpl/Dynamics/InvoiceAmountOut/InvoiceAmountService.cls.xml
===================================================================
diff -u -r49957 -r57626
--- vhTest/Mock/AXimpl/Dynamics/InvoiceAmountOut/InvoiceAmountService.cls.xml	(.../InvoiceAmountService.cls.xml)	(revision 49957)
+++ vhTest/Mock/AXimpl/Dynamics/InvoiceAmountOut/InvoiceAmountService.cls.xml	(.../InvoiceAmountService.cls.xml)	(revision 57626)
@@ -8,6 +8,12 @@
 <Super>AXimpl.Dynamics.InvoiceAmountOut.InvoiceAmountService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefFactuurBedragen">
 <FormalSpec>AXSalesId:%String</FormalSpec>
 <ReturnType>AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC</ReturnType>
Index: BL/Legacy/TRANSP/LeverbonService.cls.xml
===================================================================
diff -u
--- BL/Legacy/TRANSP/LeverbonService.cls.xml	(revision 0)
+++ BL/Legacy/TRANSP/LeverbonService.cls.xml	(revision 57626)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="BL.Legacy.TRANSP.LeverbonService">
+<Super>TECH.Mockable</Super>
+
+<Property name="KUL">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>KUL:%String="^KUL"</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..KUL = KUL
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HeeftBonMetRembours">
+<FormalSpec>SalesIdAX:%String,KlantNr:%String=""</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim HeeftOrderlijnenOpTransport As %Boolean = $$$False
+	
+	#dim ConsolidatieNr As %String = $Order(@..KUL@(KlantNr, "F", ""))
+	
+	While $$$HasLength(ConsolidatieNr){
+
+		if ..IsBonVanSalesIdAX(SalesIdAX, KlantNr, ConsolidatieNr) && ..BonHeeftRembours(KlantNr, ConsolidatieNr) {
+			Set HeeftOrderlijnenOpTransport = $$$True
+		}
+		
+		Set ConsolidatieNr = $Order(@..KUL@(KlantNr, "F", ConsolidatieNr))
+	}
+	
+	Quit HeeftOrderlijnenOpTransport
+]]></Implementation>
+</Method>
+
+<Method name="ZetRemboursBedragVoorBon">
+<FormalSpec>ConsolidatieNr:%String,KlantNr:%String,RemboursBedrag:%String</FormalSpec>
+<Implementation><![CDATA[
+	If $D(@..KUL@(KlantNr,"F",ConsolidatieNr,1)) {
+		Set R = @..KUL@(KlantNr,"F",ConsolidatieNr,1)
+		Set $Piece(R,"\",61) = RemboursBedrag
+		Set @..KUL@(KlantNr,"F",ConsolidatieNr,1) = R
+	} Else {
+		#dim Melding As %String = "Fout tijdens wegschrijven van rembours bedrag in KUL voor BON '"_ ConsolidatieNr _"' en KlantNr '" _KlantNr_"'. Bon of node bestaat niet (meer)"
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.Exceptions.GeneralErrorException).%New(Melding)
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsBonVanSalesIdAX">
+<FormalSpec>SalesIdAX:%String,KlantNr:%String,ConsolidatieNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim SalesIdAXVanBon As %String = $Piece(@..KUL@(KlantNr,"F",ConsolidatieNr,1),"\",58)
+	Quit (SalesIdAXVanBon=SalesIdAX)
+]]></Implementation>
+</Method>
+
+<Method name="BonHeeftRembours">
+<FormalSpec>KlantNr:%String,ConsolidatieNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim BonHeeftRembours As %String = $Piece(@..KUL@(KlantNr,"F",ConsolidatieNr,1),"\",61)
+	Quit $$$HasLength(BonHeeftRembours)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>