Index: AXdixf/VrijgegProduct/VrijgegProduct.cls.xml
===================================================================
diff -u -r40788 -r41317
--- AXdixf/VrijgegProduct/VrijgegProduct.cls.xml	(.../VrijgegProduct.cls.xml)	(revision 40788)
+++ AXdixf/VrijgegProduct/VrijgegProduct.cls.xml	(.../VrijgegProduct.cls.xml)	(revision 41317)
@@ -14,6 +14,34 @@
 <Default>AXdixf.VrijgegProduct.VrijgegProduct</Default>
 </Parameter>
 
+<Property name="ADUCostInsuranceFreight">
+<Type>%String</Type>
+</Property>
+
+<Property name="ADUPriceContrMargineId">
+<Type>%String</Type>
+</Property>
+
+<Property name="ADUProductGroupId">
+<Type>%String</Type>
+</Property>
+
+<Property name="ADUProductMainGroupId">
+<Type>%String</Type>
+</Property>
+
+<Property name="ADUProductSubGroupId">
+<Type>%String</Type>
+</Property>
+
+<Property name="ADUProductVersion">
+<Type>%String</Type>
+</Property>
+
+<Property name="AltItemId">
+<Type>%String</Type>
+</Property>
+
 <Property name="BatchNumGroupId">
 <Type>%String</Type>
 </Property>
@@ -54,6 +82,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="InventItemInventSetupCalendarDays">
+<Type>%String</Type>
+</Property>
+
 <Property name="InventItemInventSetupHighestQty">
 <Type>%String</Type>
 </Property>
@@ -86,6 +118,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="InventItemPurchSetupCalendarDays">
+<Type>%String</Type>
+</Property>
+
 <Property name="InventItemPurchSetupHighestQty">
 <Type>%String</Type>
 </Property>
@@ -122,6 +158,14 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="InventItemSalesDeliveryDateControlType">
+<Type>%String</Type>
+</Property>
+
+<Property name="InventItemSalesSetupATPTimeFence">
+<Type>%String</Type>
+</Property>
+
 <Property name="InventItemSalesSetupHighestQty">
 <Type>%String</Type>
 </Property>
@@ -381,18 +425,6 @@
 <Property name="WMSLocationId">
 <Type>%String</Type>
 </Property>
-
-<Property name="ADUProductVersion">
-<Type>%String</Type>
-</Property>
-
-<Property name="InventItemPurchSetupCalendarDays">
-<Type>%String</Type>
-</Property>
-
-<Property name="InventItemInventSetupCalendarDays">
-<Type>%String</Type>
-</Property>
 </Class>
 
 
Index: AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml
===================================================================
diff -u -r41166 -r41317
--- AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml	(.../VrijgegProductDixfConverter.cls.xml)	(revision 41166)
+++ AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml	(.../VrijgegProductDixfConverter.cls.xml)	(revision 41317)
@@ -22,7 +22,7 @@
 
 <UDLText name="T">
 <Content><![CDATA[
-// Volgende vier Properties zijn niet Private omwille van UnitTesting
+// Volgende 5 Properties zijn niet Private omwille van UnitTesting
 
 ]]></Content>
 </UDLText>
@@ -43,6 +43,14 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="InventItemSalesDeliveryDateControlType">
+<Type>%String</Type>
+</Property>
+
+<Property name="AltItemId">
+<Type>%String</Type>
+</Property>
+
 <Property name="LeverancierNummer">
 <Type>%String</Type>
 <Private>1</Private>
@@ -130,7 +138,7 @@
 	Set AxProduct.InventItemSalesSetupLeadTime = ""
 	Set AxProduct.InventItemSalesSetupLowestQty = ..BepaalInventItemSalesSetupLowestQtyVH(Product)
 	Set AxProduct.InventItemSalesSetupMultipleQty = ..BepaalInventItemSalesSetupMultipleQtyVH(Product)
-	Set AxProduct.InventItemSalesSetupOverride = "Nee"
+	Set AxProduct.InventItemSalesSetupOverride = ..BepaalInventItemSalesSetupOverride(Product)
 	Set AxProduct.InventItemSalesSetupStandardQty = ""
 	Set AxProduct.InventModulePurchInterCompanyBlocked = "Nee"
 	Set AxProduct.InventModuleSalesInterCompanyBlocked = "Nee"
@@ -187,11 +195,19 @@
 	Set AxProduct.SearchName = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(Product.Basis.KortTekst)
 	Set AxProduct.Stopped = "Nee"
 	Set AxProduct.UOMSeqGroupId = ..BepaalUOMSeqGroupId(Product)
-	Set AxProduct.UseAltItemId = "Nooit"
-	Set AxProduct.WMSLocationId = ""
+	Set AxProduct.AltItemId = ..BepaalAltItemId(Product)
+	Set AxProduct.UseAltItemId = ..BepaalUseAltItemId(Product)
+	Set AxProduct.WMSLocationId = ..BepaalWMSLocationIdVH(Product)
 	Set AxProduct.ADUProductVersion = "1"
 	Set AxProduct.InventItemPurchSetupCalendarDays = ..BepaalInventItemPurchSetupCalendarDaysVH(Product)
 	Set AxProduct.InventItemInventSetupCalendarDays = "1"
+	Set AxProduct.InventItemSalesDeliveryDateControlType = ..BepaalInventItemSalesDeliveryDateControlType(Product)
+	Set AxProduct.InventItemSalesSetupATPTimeFence = ..BepaalInventItemSalesSetupATPTimeFence(Product)
+	Set AxProduct.ADUProductMainGroupId = ..BepaalADUProductMainGroupId(Product)
+	Set AxProduct.ADUProductGroupId = ..BepaalADUProductGroupId(Product)
+	Set AxProduct.ADUProductSubGroupId = ..BepaalADUProductSubGroupId(Product)
+	Set AxProduct.ADUCostInsuranceFreight = ..BepaalADUCostInsuranceFreight(Product)
+	Set AxProduct.ADUPriceContrMargineId = ..BepaalADUPriceContrMargineId(Product)
 	Set ..AxProduct = AxProduct
 	Quit ..AxProduct
 ]]></Implementation>
@@ -237,7 +253,7 @@
 	Set AxProduct.InventItemSalesSetupLeadTime = ""
 	Set AxProduct.InventItemSalesSetupLowestQty = "1"
 	Set AxProduct.InventItemSalesSetupMultipleQty = "1"
-	Set AxProduct.InventItemSalesSetupOverride = "Nee"
+	Set AxProduct.InventItemSalesSetupOverride = ..BepaalInventItemSalesSetupOverride(Product)
 	Set AxProduct.InventItemSalesSetupStandardQty = ""
 	Set AxProduct.InventModulePurchInterCompanyBlocked = "Nee"
 	Set AxProduct.InventModuleSalesInterCompanyBlocked = "Nee"
@@ -294,11 +310,19 @@
 	Set AxProduct.SearchName = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(Product.Basis.KortTekst)
 	Set AxProduct.Stopped = "Nee"
 	Set AxProduct.UOMSeqGroupId = ..BepaalUOMSeqGroupId(Product)
-	Set AxProduct.UseAltItemId = "Nooit"
+	Set AxProduct.AltItemId = ..BepaalAltItemId(Product)
+	Set AxProduct.UseAltItemId = ..BepaalUseAltItemId(Product)
 	Set AxProduct.WMSLocationId = ""
 	Set AxProduct.ADUProductVersion = "1"
 	Set AxProduct.InventItemPurchSetupCalendarDays = "1"
 	Set AxProduct.InventItemInventSetupCalendarDays = "1"
+	Set AxProduct.InventItemSalesDeliveryDateControlType = ..BepaalInventItemSalesDeliveryDateControlType(Product)
+	Set AxProduct.InventItemSalesSetupATPTimeFence = ..BepaalInventItemSalesSetupATPTimeFence(Product)
+	Set AxProduct.ADUProductMainGroupId = ..BepaalADUProductMainGroupId(Product)
+	Set AxProduct.ADUProductGroupId = ..BepaalADUProductGroupId(Product)
+	Set AxProduct.ADUProductSubGroupId = ..BepaalADUProductSubGroupId(Product)
+	Set AxProduct.ADUCostInsuranceFreight = ..BepaalADUCostInsuranceFreight(Product)
+	Set AxProduct.ADUPriceContrMargineId = ..BepaalADUPriceContrMargineId(Product)
 	Set ..AxProduct = AxProduct
 	Quit ..AxProduct
 ]]></Implementation>
@@ -479,7 +503,7 @@
 	#dim LeveringsTermijn As %String = Product.Prijs.LeveringsTermijn
 	
 	If (..PrimaryVendorIdVH = "05005") {
-		Set BepaalInventItemPurchSetupLeadTimeVH = LeveringsTermijn
+		Set BepaalInventItemPurchSetupLeadTimeVH = (LeveringsTermijn * 5) + 1
 	}
 	ElseIf ((..DefaultOrderTypeVH = "Aankooporder") && (..PrimaryVendorIdVH '= "06332")) {
 		Set BepaalInventItemPurchSetupLeadTimeVH = LeveringsTermijn * 5
@@ -785,6 +809,167 @@
 	Quit BepaalInventItemPurchSetupCalendarDaysVH
 ]]></Implementation>
 </Method>
+
+<Method name="BepaalInventItemSalesDeliveryDateControlType">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim InventItemSalesDeliveryDateControlType As %String
+	#dim StockNietStock As %String = Product.Basis.StockNietStock
+	
+	If (StockNietStock '= ""){
+		Set InventItemSalesDeliveryDateControlType = "ATP + uitgiftemarge"
+	}
+	Else {
+		Set InventItemSalesDeliveryDateControlType = "CTP"
+	}
+	Set ..InventItemSalesDeliveryDateControlType = InventItemSalesDeliveryDateControlType
+	
+	Quit InventItemSalesDeliveryDateControlType
+]]></Implementation>
+</Method>
+
+<Method name="BepaalInventItemSalesSetupATPTimeFence">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim InventItemSalesSetupATPTimeFence As %String
+	
+	If (..InventItemSalesDeliveryDateControlType = "ATP + uitgiftemarge"){
+		Set InventItemSalesSetupATPTimeFence = "2"
+	}
+	Else {
+		Set InventItemSalesSetupATPTimeFence = ""
+	}
+	Quit InventItemSalesSetupATPTimeFence
+]]></Implementation>
+</Method>
+
+<Method name="BepaalInventItemSalesSetupOverride">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim InventItemSalesSetupOverride As %String
+	
+	If (..InventItemSalesDeliveryDateControlType = "ATP + uitgiftemarge"){
+		Set InventItemSalesSetupOverride = "Ja"
+	}
+	Else {
+		Set InventItemSalesSetupOverride = "Nee"
+	}
+	
+	Quit InventItemSalesSetupOverride
+]]></Implementation>
+</Method>
+
+<Method name="BepaalADUProductMainGroupId">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ADUProductMainGroupId As %String
+	#dim SubGroep As %String = Product.Klassificatie.SubGroep
+	
+	Set ADUProductMainGroupId = $Extract(SubGroep,3,4)
+	
+	Quit ADUProductMainGroupId
+]]></Implementation>
+</Method>
+
+<Method name="BepaalADUProductGroupId">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ADUProductGroupId As %String
+	#dim SubGroep As %String = Product.Klassificatie.SubGroep
+	
+	Set ADUProductGroupId = $Extract(SubGroep,7,9)
+	
+	Quit ADUProductGroupId
+]]></Implementation>
+</Method>
+
+<Method name="BepaalADUProductSubGroupId">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ADUProductSubGroupId As %String
+	#dim SubGroep As %String = Product.Klassificatie.SubGroep
+	
+	Set ADUProductSubGroupId = $Extract(SubGroep,12,17)
+	
+	Quit ADUProductSubGroupId
+]]></Implementation>
+</Method>
+
+<Method name="BepaalADUCostInsuranceFreight">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ADUCostInsuranceFreight As %String
+	#dim CifPerc As %String = Product.Prijs.CifPerc
+	
+	Set ADUCostInsuranceFreight = CifPerc
+	Set $Extract(ADUCostInsuranceFreight,$Find(ADUCostInsuranceFreight,".")-1) = ","
+	
+	Quit ADUCostInsuranceFreight
+]]></Implementation>
+</Method>
+
+<Method name="BepaalADUPriceContrMargineId">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ADUPriceContrMargineId As %String
+	#dim DBPerc As %String = Product.Prijs.DBPerc
+	
+	Set ADUPriceContrMargineId = DBPerc
+	Set $Extract(ADUPriceContrMargineId,$Find(ADUPriceContrMargineId,".")-1) = ","
+	
+	Quit ADUPriceContrMargineId
+]]></Implementation>
+</Method>
+
+<Method name="BepaalAltItemId">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim AltItemId As %String
+	
+	Set AltItemId = ""
+	Set ..AltItemId = AltItemId
+	
+	Quit AltItemId
+]]></Implementation>
+</Method>
+
+<Method name="BepaalUseAltItemId">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim UseAltItemId As %String
+	
+	If (..AltItemId = ""){
+		Set UseAltItemId = "Nooit"
+	}
+	Else {
+		Set UseAltItemId = "Altijd"
+	}
+	
+	Quit UseAltItemId
+]]></Implementation>
+</Method>
+
+<Method name="BepaalWMSLocationIdVH">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim WMSLocationIdVH As %String
+	
+	Set WMSLocationIdVH = ""
+	
+	Quit WMSLocationIdVH
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductIterator.cls.xml
===================================================================
diff -u -r41166 -r41317
--- AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductIterator.cls.xml	(.../VrijgegProductIterator.cls.xml)	(revision 41166)
+++ AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductIterator.cls.xml	(.../VrijgegProductIterator.cls.xml)	(revision 41317)
@@ -44,6 +44,10 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%'"
+	// Indien nodig is hieronder een filter voorzien om het resultaat te beperken tot overzichtelijk, voor debugging:
+	_" and ID in (1432226,1432225,1425096,1425095,682391,1359867,1168696,1168689,830507,1155640,161442,906194,709825,924268,"
+	_"1124771,1038806,1039173,1039208,1247980,353741,353743,353744,254245,254258,1259381,161441,665626,1067709,1067714,268026,"
+	_"1168369,668615,878186,878220,1169509,1194443,383880,830257)"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfGenerator.cls.xml
===================================================================
diff -u -r41008 -r41317
--- AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfGenerator.cls.xml	(.../VrijgegProductDixfGenerator.cls.xml)	(revision 41008)
+++ AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfGenerator.cls.xml	(.../VrijgegProductDixfGenerator.cls.xml)	(revision 41317)
@@ -131,6 +131,19 @@
 	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "UOMSeqGroupId","UOMSeqGroupId")
 	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "UseAltItemId","UseAltItemId")
 	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "WMSLocationId","WMSLocationId")
+	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "AltItemId","AltItemId")
+	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "InventItemSalesDeliveryDateControlType","InventItemSales_DeliveryDateControlType")
+	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "InventItemSalesSetupATPTimeFence","InventItemSalesSetup_ATPTimeFence")
+	
+	// Volgende 5 velden moeten voor upload op Staging uitgesloten worden:
+	/*
+	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "ADUProductMainGroupId","ADUProductMainGroupId")
+	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "ADUProductGroupId","ADUProductGroupId")
+	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "ADUProductSubGroupId","ADUProductSubGroupId")
+	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "ADUCostInsuranceFreight","ADUCostInsuranceFreight")
+	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "ADUPriceContrMargineId","ADUPriceContrMargineId")
+	*/
+	// Volgende 3 velden worden voorlopig niet meegenomen:
 	/*Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "ADUProductVersion","ADUProductVersion")
 	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "InventItemPurchSetupCalendarDays","InventItemPurchSetup_CalendarDays")
 	Do AXProductData.VoegToeVeld("AXdixf.VrijgegProduct.VrijgegProduct", "InventItemInventSetupCalendarDays","InventItemInventSetup_CalendarDays")
Index: vhUnitTest/AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter/Test.cls.xml
===================================================================
diff -u -r41161 -r41317
--- vhUnitTest/AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 41161)
+++ vhUnitTest/AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 41317)
@@ -30,7 +30,6 @@
 	Do $$$AssertEquals(TestProduct.InventItemSalesSetupHighestQty,"")
 	Do $$$AssertEquals(TestProduct.InventItemSalesSetupInventSiteDefault,"VHEPN1")
 	Do $$$AssertEquals(TestProduct.InventItemSalesSetupLeadTime,"")
-	Do $$$AssertEquals(TestProduct.InventItemSalesSetupOverride,"Nee")
 	Do $$$AssertEquals(TestProduct.InventItemSalesSetupStandardQty,"")
 	Do $$$AssertEquals(TestProduct.InventModulePurchInterCompanyBlocked,"Nee")
 	Do $$$AssertEquals(TestProduct.InventModuleSalesInterCompanyBlocked,"Nee")
@@ -80,8 +79,6 @@
 	Do $$$AssertEquals(TestProduct.SalesSetupStandardQty,"")
 	Do $$$AssertEquals(TestProduct.SalesSetupStopped,"")
 	Do $$$AssertEquals(TestProduct.Stopped,"Nee")
-	Do $$$AssertEquals(TestProduct.UseAltItemId,"Nooit")
-	Do $$$AssertEquals(TestProduct.WMSLocationId,"")
 	Do $$$AssertEquals(TestProduct.ADUProductVersion,"1")
 	Do $$$AssertEquals(TestProduct.InventItemInventSetupCalendarDays,"1")
 ]]></Implementation>
@@ -119,7 +116,6 @@
 	Do $$$AssertEquals(TestProduct.InventItemSalesSetupLeadTime,"")
 	Do $$$AssertEquals(TestProduct.InventItemSalesSetupLowestQty,"1")
 	Do $$$AssertEquals(TestProduct.InventItemSalesSetupMultipleQty,"1")
-	Do $$$AssertEquals(TestProduct.InventItemSalesSetupOverride,"Nee")
 	Do $$$AssertEquals(TestProduct.InventItemSalesSetupStandardQty,"")
 	Do $$$AssertEquals(TestProduct.InventModulePurchInterCompanyBlocked,"Nee")
 	Do $$$AssertEquals(TestProduct.InventModuleSalesInterCompanyBlocked,"Nee")
@@ -169,8 +165,6 @@
 	Do $$$AssertEquals(TestProduct.SalesSetupStandardQty,"")
 	Do $$$AssertEquals(TestProduct.SalesSetupStopped,"")
 	Do $$$AssertEquals(TestProduct.Stopped,"Nee")
-	Do $$$AssertEquals(TestProduct.UseAltItemId,"Nooit")
-	Do $$$AssertEquals(TestProduct.WMSLocationId,"")
 	Do $$$AssertEquals(TestProduct.ADUProductVersion,"1")
 	Do $$$AssertEquals(TestProduct.InventItemPurchSetupCalendarDays,"1")
 	Do $$$AssertEquals(TestProduct.InventItemInventSetupCalendarDays,"1")
@@ -521,7 +515,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Als PrimaryVendorIdVH = &apos;05005&apos;, dan moet InventItemPurchSetupLeadTimeVH = LeveringsTermijn">
+<Method name="Test: Als PrimaryVendorIdVH = &apos;05005&apos;, dan moet InventItemPurchSetupLeadTimeVH = LeveringsTermijn*5+1">
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
 	#dim Vestiging As %String = "VanHoecke"
@@ -534,7 +528,7 @@
 	
 	#dim InventItemPurchSetupLeadTimeVH As %String = TestProduct.BepaalInventItemPurchSetupLeadTimeVH(AxProduct)
 	
-	Do $$$AssertEquals(InventItemPurchSetupLeadTimeVH,"9")
+	Do $$$AssertEquals(InventItemPurchSetupLeadTimeVH,"46")
 ]]></Implementation>
 </Method>
 
@@ -1251,6 +1245,192 @@
 	Do $$$AssertEquals(UOMSeqGroupId,"STK-KVP-NVP-GVP-PLT")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Als StockNietStock niet leeg is, dan moet InventItemSalesDeliveryDateControlType = &apos;ATP + uitgiftemarge&apos;">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	
+	Set AxProduct.Basis.StockNietStock = "2"
+	
+	#dim InventItemSalesDeliveryDateControlType As %String = TestProduct.BepaalInventItemSalesDeliveryDateControlType(AxProduct)
+	
+	Do $$$AssertEquals(InventItemSalesDeliveryDateControlType,"ATP + uitgiftemarge")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als StockNietStock leeg is, dan moet InventItemSalesDeliveryDateControlType = &apos;CTP&apos;">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	
+	Set AxProduct.Basis.StockNietStock = ""
+	
+	#dim InventItemSalesDeliveryDateControlType As %String = TestProduct.BepaalInventItemSalesDeliveryDateControlType(AxProduct)
+	
+	Do $$$AssertEquals(InventItemSalesDeliveryDateControlType,"CTP")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als InventItemSalesDeliveryDateControlType = &apos;ATP + uitgiftemarge&apos;, dan moet InventItemSalesSetupATPTimeFence = &apos;2&apos;">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	Set TestProduct.InventItemSalesDeliveryDateControlType = "ATP + uitgiftemarge"
+	
+	#dim InventItemSalesSetupATPTimeFence As %String = TestProduct.BepaalInventItemSalesSetupATPTimeFence(AxProduct)
+	
+	Do $$$AssertEquals(InventItemSalesSetupATPTimeFence,"2")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als InventItemSalesDeliveryDateControlType &apos;= &apos;ATP + uitgiftemarge&apos;, dan moet InventItemSalesSetupATPTimeFence = &apos;&apos;">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	Set TestProduct.InventItemSalesDeliveryDateControlType = "CTP"
+	
+	#dim InventItemSalesSetupATPTimeFence As %String = TestProduct.BepaalInventItemSalesSetupATPTimeFence(AxProduct)
+	
+	Do $$$AssertEquals(InventItemSalesSetupATPTimeFence,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als InventItemSalesDeliveryDateControlType = &apos;ATP + uitgiftemarge&apos;, dan moet InventItemSalesSetupOverride = &apos;Ja&apos;">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	Set TestProduct.InventItemSalesDeliveryDateControlType = "ATP + uitgiftemarge"
+	
+	#dim InventItemSalesSetupOverride As %String = TestProduct.BepaalInventItemSalesSetupOverride(AxProduct)
+	
+	Do $$$AssertEquals(InventItemSalesSetupOverride,"Ja")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als InventItemSalesDeliveryDateControlType &apos;= &apos;ATP + uitgiftemarge&apos;, dan moet InventItemSalesSetupOverride = &apos;Nee&apos;">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	Set TestProduct.InventItemSalesDeliveryDateControlType = "CTP"
+	
+	#dim InventItemSalesSetupOverride As %String = TestProduct.BepaalInventItemSalesSetupOverride(AxProduct)
+	
+	Do $$$AssertEquals(InventItemSalesSetupOverride,"Nee")
+]]></Implementation>
+</Method>
+
+<Method name="Test: ADUProductMainGroupId = het 2e en 3e karakter van Product Klassificatie SubGroep">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	
+	Set AxProduct.Klassificatie.SubGroep = "08CY05ZSL01ZSL/HK "
+	
+	#dim ADUProductMainGroupId As %String = TestProduct.BepaalADUProductMainGroupId(AxProduct)
+	
+	Do $$$AssertEquals(ADUProductMainGroupId,"CY")
+	Do $$$AssertNotEquals(ADUProductMainGroupId,"08CY05ZSL01ZSL/HK")
+]]></Implementation>
+</Method>
+
+<Method name="Test: ADUProductGroupId = het 7e tot en met 9e karakter van Product Klassificatie SubGroep">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	
+	Set AxProduct.Klassificatie.SubGroep = "08CY05ZSL01ZSL/HK "
+	
+	#dim ADUProductGroupId As %String = TestProduct.BepaalADUProductGroupId(AxProduct)
+	
+	Do $$$AssertEquals(ADUProductGroupId,"ZSL")
+	Do $$$AssertNotEquals(ADUProductGroupId,"08CY05ZSL01ZSL/HK")
+]]></Implementation>
+</Method>
+
+<Method name="Test: ADUProductSubGroupId = het 12e tot en met 17e karakter van Product Klassificatie SubGroep">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	
+	Set AxProduct.Klassificatie.SubGroep = "08CY05ZSL01ZSL/HK"
+	
+	#dim ADUProductSubGroupId As %String = TestProduct.BepaalADUProductSubGroupId(AxProduct)
+	
+	Do $$$AssertEquals(ADUProductSubGroupId,"ZSL/HK")
+	Do $$$AssertNotEquals(ADUProductSubGroupId,"08CY05ZSL01ZSL/HK")
+]]></Implementation>
+</Method>
+
+<Method name="Test: ADUCostInsuranceFreight = Product Prijs CifPerc met puntjes vervangen door komma&apos;s">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	
+	Set AxProduct.Prijs.CifPerc = "25.15"
+	
+	#dim ADUCostInsuranceFreight As %String = TestProduct.BepaalADUCostInsuranceFreight(AxProduct)
+	
+	Do $$$AssertEquals(ADUCostInsuranceFreight,"25,15")
+	Do $$$AssertNotEquals(ADUCostInsuranceFreight,"25.15")
+]]></Implementation>
+</Method>
+
+<Method name="Test: ADUPriceContrMargineId = Product Prijs DBPerc met puntjes vervangen door komma&apos;s">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	#dim Vestiging As %String = "VanHoecke"
+	#dim LeverancierNummer As %String = "6332"
+	
+	#dim TestProduct As %String = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New(Vestiging,LeverancierNummer)
+	
+	Set AxProduct.Prijs.DBPerc = "25.15"
+	
+	#dim ADUPriceContrMargineId As %String = TestProduct.BepaalADUPriceContrMargineId(AxProduct)
+	
+	Do $$$AssertEquals(ADUPriceContrMargineId,"25,15")
+	Do $$$AssertNotEquals(ADUPriceContrMargineId,"25.15")
+]]></Implementation>
+</Method>
+
+<Method name="Test: AltItemId = uit te pluizen in Admin">
+</Method>
+
+<Method name="Test: UseAltItemId = &apos;Altijd&apos; als AltItemId een IdentNummer bevat, anders &apos;Nooit&apos;">
+</Method>
+
+<Method name="Test: WMSLocationId = te bevragen bij Karel">
+</Method>
 </Class>