Index: vhTest/Fake/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml
===================================================================
diff -u -r56421 -r56865
--- vhTest/Fake/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 56421)
+++ vhTest/Fake/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 56865)
@@ -11,6 +11,13 @@
 <FormalSpec>Order:DOM.VKP.Order</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
+
+<Method name="GeefToeleveringenReedsInBatch">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml
===================================================================
diff -u -r48423 -r56865
--- AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 48423)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 56865)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="BatchService">
+<Type>APPS.Halux.common.BatchService</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Logger">
 <Type>vhLib.Logger</Type>
 <Private>1</Private>
@@ -22,6 +27,7 @@
 <Implementation><![CDATA[
 	Set ..SalesOrderLineStatusRepository = $$$Inject(SalesOrderLineStatusRepository, ##class(AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository).%New())
 
+	Set ..BatchService = ##class(APPS.Halux.common.impl.BatchService).%New()
 	Set ..Logger = ##class(vhLib.Logger).%New()
 	
 	Quit $$$OK
@@ -31,6 +37,14 @@
 <Method name="VerwijderToeleveringenViaOrder">
 <FormalSpec>Order:DOM.VKP.Order</FormalSpec>
 <Implementation><![CDATA[
+	#dim ControleerToeleveringenInBatch As %Boolean = $$$True   ; Kan later ook als method parameter gevraagd worden. 
+	If ControleerToeleveringenInBatch {
+		#dim ToeleveringenReedsInBatch As %ListOfDataTypes = ..GeefToeleveringenReedsInBatch(Order)
+		If ToeleveringenReedsInBatch.Count() > 0 {
+			Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Voor het order '" _Order.GeefID() _"' zijn toeleveringen reeds in Batch (ToeNr: "_##class(TECH.ListUtils).ListToPieces(ToeleveringenReedsInBatch,", ")_ "). Toelevering(en) en Order worden niet verwijderd.")
+		}
+	}
+
 	Do ##class(vhLib.OldSchool).InitVars()			
 
 	#dim ToeleveringIDArray As TECH.MultiDim = ""
@@ -41,6 +55,28 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefToeleveringenReedsInBatch">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	#dim OrderLijnIterator As TECH.ListIterator
+	#dim OrderLijn As DOM.VKP.ProductOrderlijn
+	#dim ToeleveringId As %String
+	#dim BatchId As %String
+
+	Set ToeleveringenReedsInBatch = ##class(%ListOfDataTypes).%New()
+	
+	Set OrderLijnIterator = Order.GeefProductOrderLijnIterator()
+	While OrderLijnIterator.HasNext() {
+		Set OrderLijn = OrderLijnIterator.Next()
+		Set ToeleveringId = OrderLijn.GeefToeleveringID()
+		Set BatchId = ..BatchService.ZoekBijhorendeBatchIdVoorToelevering(ToeleveringId)
+		If $$$HasLength(BatchId) Do ToeleveringenReedsInBatch.Insert(ToeleveringId)   ; ofwel:  Do ToeleveringenReedsInBatch.SetAt(BatchId, ToeleveringId) 
+	}
+	Quit ##class(TECH.ListUtils).RemoveDuplicateItems(ToeleveringenReedsInBatch)
+]]></Implementation>
+</Method>
+
 <Method name="ZetToeleveringIDArray">
 <FormalSpec><![CDATA[Order:DOM.VKP.Order,&ToeleveringIDArray:TECH.MultiDim]]></FormalSpec>
 <Private>1</Private>
Index: vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml
===================================================================
diff -u -r47989 -r56865
--- vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 47989)
+++ vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 56865)
@@ -8,6 +8,20 @@
 <Super>AXimpl.Dynamics.SalesOrderIn.Converter.ToeleveringService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="%OnNew">
+<FormalSpec>SalesOrderLineStatusRepository:AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefToeleveringenReedsInBatch">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefToeleveringenReedsInBatch",Order)
+]]></Implementation>
+</Method>
+
 <Method name="VerwijderToeleveringenViaOrder">
 <FormalSpec>Order:DOM.VKP.Order</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderToeleveringenViaOrder",Order)