Index: vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestZetColliDragerType.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestZetColliDragerType.cls.xml	(revision 0)
+++ vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestZetColliDragerType.cls.xml	(revision 37900)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.VKP.OrderIngaveService.MaakOrderVanOfferte.TestZetColliDragerType">
+<Super>vhUnitTest.APPS.VKP.OrderIngaveService.MaakOrderVanOfferte.TestBase</Super>
+
+<Method name="Test: MaakOrderVanOfferte bevat WegwerpPallet als ColliDragerType met aantal palletten 1">
+<Implementation><![CDATA[
+	Set ..Offerte.VerzendingItem = ##class(APPS.VKP.impl.Offerte.VerzendingItem).%New()
+	Set ..Offerte.VerzendingItem.Code = 4
+	Set ..Offerte.VerzendingItem.Duurtijd = 3
+	Set ..Offerte.VerzendingItem.VerkoopPrijs = 40
+	Set ..Offerte.VerzendingItem.Omschrijving = "DHL Freight" 
+	Set ..Offerte.VerzendingItem.AantalPalletten = 1
+	Do ..Offerte.Save()
+
+	#dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	
+	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
+
+	If $$$AssertTrue($IsObject(Order)) {
+		Do $$$AssertEquals(Order.GeefColliDragerType(),##class(DOM.VKP.enu.ColliDragerType).WegwerpPallet())
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: MaakOrderVanOfferte bevat WegwerpPallet als ColliDragerType met aantal palletten 99">
+<Implementation><![CDATA[
+	Set ..Offerte.VerzendingItem = ##class(APPS.VKP.impl.Offerte.VerzendingItem).%New()
+	Set ..Offerte.VerzendingItem.Code = 4
+	Set ..Offerte.VerzendingItem.Duurtijd = 3
+	Set ..Offerte.VerzendingItem.VerkoopPrijs = 40
+	Set ..Offerte.VerzendingItem.Omschrijving = "DHL Freight" 
+	Set ..Offerte.VerzendingItem.AantalPalletten = 99
+	Do ..Offerte.Save()
+
+	#dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	
+	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
+
+	If $$$AssertTrue($IsObject(Order)) {
+		Do $$$AssertEquals(Order.GeefColliDragerType(),##class(DOM.VKP.enu.ColliDragerType).WegwerpPallet())
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: MaakOrderVanOfferte bevat ColliDragerType voor offerte met aantal palletten 0">
+<Implementation><![CDATA[
+	Set ..Offerte.VerzendingItem = ##class(APPS.VKP.impl.Offerte.VerzendingItem).%New()
+	Set ..Offerte.VerzendingItem.Code = 4
+	Set ..Offerte.VerzendingItem.Duurtijd = 3
+	Set ..Offerte.VerzendingItem.VerkoopPrijs = 40
+	Set ..Offerte.VerzendingItem.Omschrijving = "DHL Freight" 
+	Set ..Offerte.VerzendingItem.AantalPalletten = 0
+	Do ..Offerte.Save()
+
+	#dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	
+	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
+
+	If $$$AssertTrue($IsObject(Order)) {
+		Do $$$AssertEquals(Order.GeefColliDragerType(),"")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: MaakOrderVanOfferte bevat geen ColliDragerType voor offerte zonder VerzendItem">
+<Implementation><![CDATA[
+	Set ..Offerte.VerzendingItem = ""
+	Do ..Offerte.Save()
+
+	#dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	
+	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
+
+	If $$$AssertTrue($IsObject(Order)) {
+		Do $$$AssertEquals(Order.GeefColliDragerType(),"")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: MaakOrderVanOfferte bevat geen ColliDragerType voor offerte met VerzendItem zonder palletten">
+<Implementation><![CDATA[
+	Set ..Offerte.VerzendingItem = ##class(APPS.VKP.impl.Offerte.VerzendingItem).%New()
+	Set ..Offerte.VerzendingItem.AantalPalletten = ""
+	Do ..Offerte.Save()
+
+	#dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
+	
+	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
+
+	If $$$AssertTrue($IsObject(Order)) {
+		Do $$$AssertEquals(Order.GeefColliDragerType(),"")
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/impl/DataM/DataMOrder.cls.xml
===================================================================
diff -u -r34701 -r37900
--- DOM/VKP/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 34701)
+++ DOM/VKP/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 37900)
@@ -52,6 +52,12 @@
 <Transient>1</Transient>
 </Property>
 
+<Property name="ColliDragerType">
+<Type>DOM.VKP.enu.ColliDragerType</Type>
+<Private>1</Private>
+<Transient>1</Transient>
+</Property>
+
 <Property name="VolgendLijnNr">
 <Type>%Integer</Type>
 <Private>1</Private>
@@ -319,6 +325,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetColliDragerType">
+<FormalSpec>ColliDragerType:DOM.VKP.enu.ColliDragerType</FormalSpec>
+<Implementation><![CDATA[	Set ..ColliDragerType = ColliDragerType
+]]></Implementation>
+</Method>
+
+<Method name="GeefColliDragerType">
+<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
+<Implementation><![CDATA[	Quit ..ColliDragerType
+]]></Implementation>
+</Method>
+
 <Method name="MaakNieuweProductLijn">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>DOM.VKP.ProductOrderlijn</ReturnType>
Index: vhTest/Mock/DOM/VKP/Order.cls.xml
===================================================================
diff -u -r34701 -r37900
--- vhTest/Mock/DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 34701)
+++ vhTest/Mock/DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 37900)
@@ -59,6 +59,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefColliDragerType">
+<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefColliDragerType")
+]]></Implementation>
+</Method>
+
 <Method name="GeefCommercieleKortingManueleOrderLijn">
 <ReturnType>DOM.VKP.CommercieleKortingManueleOrderlijn</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefCommercieleKortingManueleOrderLijn")
@@ -328,6 +334,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetColliDragerType">
+<FormalSpec>ColliDragerType:DOM.VKP.enu.ColliDragerType</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetColliDragerType",ColliDragerType)
+]]></Implementation>
+</Method>
+
 <Method name="ZetCommissieReferentie">
 <FormalSpec>value:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetCommissieReferentie",value)
Index: DOM/VKP/Order.cls.xml
===================================================================
diff -u -r34701 -r37900
--- DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 34701)
+++ DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 37900)
@@ -85,6 +85,16 @@
 <ReturnType>%String</ReturnType>
 </Method>
 
+<Method name="ZetColliDragerType">
+<Abstract>1</Abstract>
+<FormalSpec>ColliDragerType:DOM.VKP.enu.ColliDragerType</FormalSpec>
+</Method>
+
+<Method name="GeefColliDragerType">
+<Abstract>1</Abstract>
+<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
+</Method>
+
 <Method name="MaakNieuweProductLijn">
 <Abstract>1</Abstract>
 <FormalSpec>ProductID:%String</FormalSpec>
Index: APPS/VKP/OrderIngaveService.cls.xml
===================================================================
diff -u -r37872 -r37900
--- APPS/VKP/OrderIngaveService.cls.xml	(.../OrderIngaveService.cls.xml)	(revision 37872)
+++ APPS/VKP/OrderIngaveService.cls.xml	(.../OrderIngaveService.cls.xml)	(revision 37900)
@@ -140,7 +140,7 @@
 			Do Order.ZetLeveringVoorwaarde(##class(DOM.CRM.enu.LeveringVoorwaarde).KostInManueleLijn())
 			Do Order.ZetVerzendingWijze(..VerzendwijzeItemNaarVerzendWijze(Offerte.VerzendingItem))
 			Do ..VoegToeVerzendingAlsManueleLijn(Order, Offerte)
-			Do ..VoegToeTekstLijnMetPalletten(Order, Offerte)
+			Do ..VoegToePalletten(Order, Offerte)
 		}
 
 		Do ..TekstLijnenToevoeger.VoegToeOpmerkingLijnenAanOrder(Order, Offerte)
@@ -162,12 +162,13 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VoegToeTekstLijnMetPalletten">
+<Method name="VoegToePalletten">
 <FormalSpec>Order:DOM.VKP.Order,Offerte:APPS.VKP.impl.Offerte</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	If Offerte.VerzendingItem.AantalPalletten > 0 {
 		Do Order.MaakNieuweTekstLijn("Aantal palletten is " _Offerte.VerzendingItem.AantalPalletten)
+		Do Order.ZetColliDragerType(##class(DOM.VKP.enu.ColliDragerType).WegwerpPallet())
 	}
 ]]></Implementation>
 </Method>
Index: DOM/VKP/enu/ColliDragerType.cls.xml
===================================================================
diff -u
--- DOM/VKP/enu/ColliDragerType.cls.xml	(revision 0)
+++ DOM/VKP/enu/ColliDragerType.cls.xml	(revision 37900)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.enu.ColliDragerType">
+<Super>TECH.Enumeration</Super>
+
+<Parameter name="DISPLAYLIST">
+<Default>;WegwerpPallet</Default>
+</Parameter>
+
+<Parameter name="VALUELIST">
+<Default>;WegwerpPallet</Default>
+</Parameter>
+
+<Method name="WegwerpPallet">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
+<Implementation><![CDATA[	Quit "WegwerpPallet"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>