Index: vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestBase.cls.xml
===================================================================
diff -u -r46314 -r70490
--- vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 46314)
+++ vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 70490)
@@ -81,6 +81,14 @@
 			Do ##class(DOM.DomeinContext).Instance().GeefOrderAPI().VerwijderOrder(..OrderID)
 		}
 	}
+
+	If ($IsObject(..Offerte)) && (..Offerte.GeefOrderID() > 0) {
+		If ##class(DOM.DomeinContext).Instance().GeefOrderAPI().BestaatOrder(..Offerte.GeefOrderID()) {
+			Do ##class(DOM.DomeinContext).Instance().GeefOrderAPI().VerwijderOrder(..Offerte.GeefOrderID())
+		}
+	}
+
+
 	If $IsObject(..Winkelkar) {
 		Do ..Winkelkar.Delete()
 	}
Index: vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestVerzendwijze.cls.xml
===================================================================
diff -u -r37054 -r70490
--- vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestVerzendwijze.cls.xml	(.../TestVerzendwijze.cls.xml)	(revision 37054)
+++ vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestVerzendwijze.cls.xml	(.../TestVerzendwijze.cls.xml)	(revision 70490)
@@ -59,6 +59,7 @@
 	Do ..Offerte.Save()
 
 	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
Index: vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestPallettenAlsTekstLijn.cls.xml
===================================================================
diff -u -r48732 -r70490
--- vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestPallettenAlsTekstLijn.cls.xml	(.../TestPallettenAlsTekstLijn.cls.xml)	(revision 48732)
+++ vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestPallettenAlsTekstLijn.cls.xml	(.../TestPallettenAlsTekstLijn.cls.xml)	(revision 70490)
@@ -16,6 +16,7 @@
 	Do ..Offerte.Save()
 
 	#dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
@@ -36,6 +37,7 @@
 	Do ..Offerte.Save()
 
 	#dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
@@ -56,6 +58,7 @@
 	Do ..Offerte.Save()
 
 	#dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
@@ -75,6 +78,7 @@
 	Do ..Offerte.Save()
 
 	#dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
@@ -95,6 +99,7 @@
 	Do ..Offerte.Save()
 
 	#dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
Index: vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestKostOpManueleLijn.cls.xml
===================================================================
diff -u -r34690 -r70490
--- vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestKostOpManueleLijn.cls.xml	(.../TestKostOpManueleLijn.cls.xml)	(revision 34690)
+++ vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestKostOpManueleLijn.cls.xml	(.../TestKostOpManueleLijn.cls.xml)	(revision 70490)
@@ -13,6 +13,7 @@
 	Do ..Offerte.Save()
 
 	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
@@ -28,6 +29,7 @@
 	Do ..Offerte.Save()
 
 	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
Index: vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestOrderIngaveService.cls.xml
===================================================================
diff -u -r54438 -r70490
--- vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestOrderIngaveService.cls.xml	(.../TestOrderIngaveService.cls.xml)	(revision 54438)
+++ vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestOrderIngaveService.cls.xml	(.../TestOrderIngaveService.cls.xml)	(revision 70490)
@@ -89,6 +89,7 @@
 	Do ..Offerte.Save()
 
 	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
Index: vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestProductLijn.cls.xml
===================================================================
diff -u -r53652 -r70490
--- vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestProductLijn.cls.xml	(.../TestProductLijn.cls.xml)	(revision 53652)
+++ vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestProductLijn.cls.xml	(.../TestProductLijn.cls.xml)	(revision 70490)
@@ -20,6 +20,7 @@
 	Do ..Offerte.Save()
 
 	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
@@ -55,6 +56,7 @@
 	Do ..Offerte.Save()
 
 	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
@@ -83,6 +85,7 @@
 	Do ..Offerte.Save()
 
 	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
 
@@ -103,6 +106,7 @@
 	Do ..Offerte.Save()
 
 	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	Set ..OrderID = Order.GeefID()
 	
 	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)