Index: AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml
===================================================================
diff -u -r40872 -r40940
--- AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml	(.../VrijgegProductDixfConverter.cls.xml)	(revision 40872)
+++ AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml	(.../VrijgegProductDixfConverter.cls.xml)	(revision 40940)
@@ -25,98 +25,117 @@
 <Private>1</Private>
 </Property>
 
-<Property name="DefaultOrderTypeVHProp">
+<UDLText name="T">
+<Content><![CDATA[
+// Volgende vier Properties zijn niet Private omwille van UnitTesting
+
+]]></Content>
+</UDLText>
+
+<Property name="DefaultOrderTypeVH">
 <Type>%String</Type>
-<Private>1</Private>
 </Property>
 
-<Property name="DefaultOrderTypeHLXProp">
+<Property name="DefaultOrderTypeHLX">
 <Type>%String</Type>
-<Private>1</Private>
 </Property>
 
-<Property name="PrimaryVendorIdVHProp">
+<Property name="PrimaryVendorIdVH">
 <Type>%String</Type>
-<Private>1</Private>
 </Property>
 
-<Property name="PrimaryVendorIdHLXProp">
+<Property name="PrimaryVendorIdHLX">
 <Type>%String</Type>
+</Property>
+
+<Property name="LeverancierNummer">
+<Type>%String</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductBepaler:AXdixf.VrijgegProduct.VrijgegProduct,Vestiging:%String</FormalSpec>
+<FormalSpec>ProductBepaler:AXdixf.VrijgegProduct.VrijgegProduct,Vestiging:%String,LeverancierNummer:%String=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ProductBepaler = $$$Inject(ProductBepaler, ##class(AXdixf.VrijgegProduct.VrijgegProduct).%New())
 	Set ..Vestiging = Vestiging
+	Set ..LeverancierNummer = LeverancierNummer
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLeverancierNummer">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set:(..LeverancierNummer = "") ..LeverancierNummer = Product.Basis.LeverancierNummer
+	Quit ..LeverancierNummer
+]]></Implementation>
+</Method>
+
 <Method name="Convert">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>AXdixf.VrijgegProduct.VrijgegProduct</ReturnType>
 <Implementation><![CDATA[
 	If ..Vestiging = "VanHoecke" {
-		Do ..ConvertVanHoecke(ResultSet)
+		Do ..ConvertVanHoecke(Product)
 	}
 	Else {
 		If ..Vestiging = "Halux" {
-			Do ..ConvertHalux(ResultSet)
+			Do ..ConvertHalux(Product)
 		}
 		Else {
 			Write !,"Geef als parameter ofwel VanHoecke, ofwel Halux mee!"
 		}
 	}
+	Set ..LeverancierNummer = ""
 	Quit ..AxProduct
 ]]></Implementation>
 </Method>
 
 <Method name="ConvertVanHoecke">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>AXdixf.VrijgegProduct.VrijgegProduct</ReturnType>
 <Implementation><![CDATA[
 	Set AxProduct = ##class(AXdixf.VrijgegProduct.VrijgegProduct).%New()
 	Set AxProduct.BatchNumGroupId = "Batch"
 	Set AxProduct.BOMUnitId = "STK"
 	Set AxProduct.CostGroupId = ""
 	Set AxProduct.DefaultInventSiteId = "VHEPN1"
-	Set AxProduct.DefaultOrderType = ..DefaultOrderTypeVH(ResultSet)
-	Set ..DefaultOrderTypeVHProp = AxProduct.DefaultOrderType
-	Set AxProduct.DisplayProductNumber = ResultSet.GetDataByName("IdentNummer")
+	Set AxProduct.DefaultOrderType = ..BepaalDefaultOrderTypeVH(Product)
+	Set ..DefaultOrderTypeVH = AxProduct.DefaultOrderType
+	Set AxProduct.DisplayProductNumber = Product.Basis.IdentNummer
 	Set AxProduct.EcoResStorageDimensionGroupName = "WMS"
 	Set AxProduct.EcoResTrackingDimensionGroupName = "Batch"
-	Set AxProduct.Intracode = ..Intracode(ResultSet)
+	Set AxProduct.Intracode = ..BepaalIntracode(Product)
 	Set AxProduct.InventItemInventMandatoryInventLocation = "Nee"
 	Set AxProduct.InventItemInventSetupHighestQty = ""
 	Set AxProduct.InventItemInventSetupInventSiteDefault = "VHEPN1"
 	Set AxProduct.InventItemInventSetupLeadTime = "0"
-	Set AxProduct.InventItemInventSetupLowestQty = ..InventItemInventSetupLowestQty(ResultSet)
+	Set AxProduct.InventItemInventSetupLowestQty = ..BepaalInventItemInventSetupLowestQty(Product)
 	Set AxProduct.InventItemInventSetupMultipleQty = AxProduct.InventItemInventSetupLowestQty
-	Set AxProduct.InventItemInventSetupStandardQty = ..InventItemInventSetupStandardQty(ResultSet)
+	Set AxProduct.InventItemInventSetupStandardQty = ..BepaalInventItemInventSetupStandardQty(Product)
 	Set AxProduct.InventItemInventSetupStopped = "Nee"
 	Set AxProduct.InventItemPurchMandatoryInventLocation = "Nee"
 	Set AxProduct.InventItemPurchSetupHighestQty = ""
 	Set AxProduct.InventItemPurchSetupInventSiteDefault = "VHEPN1"
-	Set AxProduct.PrimaryVendorId = ..PrimaryVendorIdVH(ResultSet)
-	Set ..PrimaryVendorIdVHProp = AxProduct.PrimaryVendorId
-	Set AxProduct.InventItemPurchSetupLeadTime = ..InventItemPurchSetupLeadTimeVH(ResultSet)
-	Set AxProduct.InventItemPurchSetupLowestQty = ResultSet.GetDataByName("MinimumBestelhoeveelheid")
+	Set AxProduct.PrimaryVendorId = ..BepaalPrimaryVendorIdVH(Product)
+	Set ..PrimaryVendorIdVH = AxProduct.PrimaryVendorId
+	Set AxProduct.InventItemPurchSetupLeadTime = ..BepaalInventItemPurchSetupLeadTimeVH(Product)
+	Set AxProduct.InventItemPurchSetupLowestQty = Product.Prijs.MinimumBestelhoeveelheid
 	Set AxProduct.InventItemPurchSetupMandatoryInventSite = "Nee"
-	Set AxProduct.InventItemPurchSetupMultipleQty = ..BepaalVerpakking(ResultSet)
+	Set AxProduct.InventItemPurchSetupMultipleQty = ..BepaalVerpakking(Product)
 	Set AxProduct.InventItemPurchSetupOverride = "Nee"
 	Set AxProduct.InventItemPurchSetupStandardQty = ""
-	Set AxProduct.InventItemPurchSetupStopped = ..InventItemPurchSetupStopped(ResultSet)
+	Set AxProduct.InventItemPurchSetupStopped = ..BepaalInventItemPurchSetupStopped(Product)
 	Set AxProduct.InventItemSalesSetupHighestQty = ""
 	Set AxProduct.InventItemSalesSetupInventSiteDefault = "VHEPN1"
 	Set AxProduct.InventItemSalesSetupLeadTime = ""
-	Set AxProduct.InventItemSalesSetupLowestQty = ..InventItemSalesSetupLowestQtyVH(ResultSet)
-	Set AxProduct.InventItemSalesSetupMultipleQty = ..InventItemSalesSetupMultipleQtyVH(ResultSet)
+	Set AxProduct.InventItemSalesSetupLowestQty = ..BepaalInventItemSalesSetupLowestQtyVH(Product)
+	Set AxProduct.InventItemSalesSetupMultipleQty = ..BepaalInventItemSalesSetupMultipleQtyVH(Product)
 	Set AxProduct.InventItemSalesSetupOverride = "Nee"
 	Set AxProduct.InventItemSalesSetupStandardQty = ""
 	Set AxProduct.InventModulePurchInterCompanyBlocked = "Nee"
@@ -143,16 +162,16 @@
 	Set AxProduct.InventTableModuleSalesUnitId = "STK"
 	Set AxProduct.ItemDimCostPrice = "Nee"
 	Set AxProduct.ItemGroupId = "HG"
-	Set AxProduct.ItemId = ResultSet.GetDataByName("IdentNummer")
+	Set AxProduct.ItemId = Product.Basis.IdentNummer
 	Set AxProduct.ItemInventLocationId = "MAG1"
 	Set AxProduct.ItemType = "Artikel"
 	Set AxProduct.LowestQty = "1"
 	Set AxProduct.MinimumPalletQuantity = ""
 	Set AxProduct.ModelGroupId = "FIFO"
-	Set AxProduct.NameAlias = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(ResultSet.GetDataByName("KortTekst"))
-	Set AxProduct.NetWeight = ..NetWeight(ResultSet)
+	Set AxProduct.NameAlias = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(Product.Basis.KortTekst)
+	Set AxProduct.NetWeight = ..BepaalNetWeight(Product)
 	Set AxProduct.OrigCountryRegionId = ""
-	Set AxProduct.PmfProductType = ..PmfProductTypeVH(ResultSet)
+	Set AxProduct.PmfProductType = ..BepaalPmfProductTypeVH(Product)
 	Set AxProduct.ProdFlushingPrincip = "Finish"
 	Set AxProduct.PurchInventLocationId = "MAG1"
 	Set AxProduct.PurchSetupHighestQty = ""
@@ -162,7 +181,7 @@
 	Set AxProduct.PurchSetupOverride = ""
 	Set AxProduct.PurchSetupStandardQty = ""
 	Set AxProduct.PurchSetupStopped = ""
-	Set AxProduct.ReqGroupId = ..ReqGroupIdVH(ResultSet)
+	Set AxProduct.ReqGroupId = ..BepaalReqGroupIdVH(Product)
 	Set AxProduct.SalesInventLocationId = "MAG1"
 	Set AxProduct.SalesSetupHighestQty = ""
 	Set AxProduct.SalesSetupLeadTime = ""
@@ -171,34 +190,34 @@
 	Set AxProduct.SalesSetupOverride = ""
 	Set AxProduct.SalesSetupStandardQty = ""
 	Set AxProduct.SalesSetupStopped = ""
-	Set AxProduct.SearchName = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(ResultSet.GetDataByName("KortTekst"))
+	Set AxProduct.SearchName = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(Product.Basis.KortTekst)
 	Set AxProduct.Stopped = "Nee"
-	Set AxProduct.UOMSeqGroupId = ..UOMSeqGroupId(ResultSet)
+	Set AxProduct.UOMSeqGroupId = ..BepaalUOMSeqGroupId(Product)
 	Set AxProduct.UseAltItemId = "Nooit"
 	Set AxProduct.WMSLocationId = ""
 	Set AxProduct.ADUProductVersion = "1"
-	Set AxProduct.InventItemPurchSetupCalendarDays = ..InventItemPurchSetupCalendarDaysVH(ResultSet)
+	Set AxProduct.InventItemPurchSetupCalendarDays = ..BepaalInventItemPurchSetupCalendarDaysVH(Product)
 	Set AxProduct.InventItemInventSetupCalendarDays = "1"
 	Set ..AxProduct = AxProduct
 	Quit ..AxProduct
 ]]></Implementation>
 </Method>
 
 <Method name="ConvertHalux">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>AXdixf.VrijgegProduct.VrijgegProduct</ReturnType>
 <Implementation><![CDATA[
 	Set AxProduct = ##class(AXdixf.VrijgegProduct.VrijgegProduct).%New()
 	Set AxProduct.BatchNumGroupId = "Batch"
 	Set AxProduct.BOMUnitId = "STK"
 	Set AxProduct.CostGroupId = ""
 	Set AxProduct.DefaultInventSiteId = "HLXEPN1"
-	Set AxProduct.DefaultOrderType = ..DefaultOrderTypeHLX(ResultSet)
-	Set ..DefaultOrderTypeHLXProp = AxProduct.DefaultOrderType
-	Set AxProduct.DisplayProductNumber = ResultSet.GetDataByName("IdentNummer")
+	Set AxProduct.DefaultOrderType = ..BepaalDefaultOrderTypeHLX(Product)
+	Set ..DefaultOrderTypeHLX = AxProduct.DefaultOrderType
+	Set AxProduct.DisplayProductNumber = Product.Basis.IdentNummer
 	Set AxProduct.EcoResStorageDimensionGroupName = "WMS"
 	Set AxProduct.EcoResTrackingDimensionGroupName = "Batch"
-	Set AxProduct.Intracode = ..Intracode(ResultSet)
+	Set AxProduct.Intracode = ..BepaalIntracode(Product)
 	Set AxProduct.InventItemInventMandatoryInventLocation = "Nee"
 	Set AxProduct.InventItemInventSetupHighestQty = ""
 	Set AxProduct.InventItemInventSetupInventSiteDefault = "HLXEPN1"
@@ -210,15 +229,15 @@
 	Set AxProduct.InventItemPurchMandatoryInventLocation = "Nee"
 	Set AxProduct.InventItemPurchSetupHighestQty = ""
 	Set AxProduct.InventItemPurchSetupInventSiteDefault = "HLXEPN1"
-	Set AxProduct.PrimaryVendorId = ..PrimaryVendorIdHLX(ResultSet)
-	Set ..PrimaryVendorIdHLXProp = AxProduct.PrimaryVendorId
-	Set AxProduct.InventItemPurchSetupLeadTime = ..InventItemPurchSetupLeadTimeHLX(ResultSet)
-	Set AxProduct.InventItemPurchSetupLowestQty = ResultSet.GetDataByName("MinimumBestelhoeveelheid")
+	Set AxProduct.PrimaryVendorId = ..BepaalPrimaryVendorIdHLX(Product)
+	Set ..PrimaryVendorIdHLX = AxProduct.PrimaryVendorId
+	Set AxProduct.InventItemPurchSetupLeadTime = ..BepaalInventItemPurchSetupLeadTimeHLX(Product)
+	Set AxProduct.InventItemPurchSetupLowestQty = ..BepaalInventItemPurchSetupLowestQtyHLX(Product)
 	Set AxProduct.InventItemPurchSetupMandatoryInventSite = "Nee"
-	Set AxProduct.InventItemPurchSetupMultipleQty = ..InventItemPurchSetupMultipleQtyHLX(ResultSet)
+	Set AxProduct.InventItemPurchSetupMultipleQty = ..BepaalInventItemPurchSetupMultipleQtyHLX(Product)
 	Set AxProduct.InventItemPurchSetupOverride = "Nee"
 	Set AxProduct.InventItemPurchSetupStandardQty = ""
-	Set AxProduct.InventItemPurchSetupStopped = ..InventItemPurchSetupStopped(ResultSet)
+	Set AxProduct.InventItemPurchSetupStopped = ..BepaalInventItemPurchSetupStopped(Product)
 	Set AxProduct.InventItemSalesSetupHighestQty = ""
 	Set AxProduct.InventItemSalesSetupInventSiteDefault = "HLXEPN1"
 	Set AxProduct.InventItemSalesSetupLeadTime = ""
@@ -250,16 +269,16 @@
 	Set AxProduct.InventTableModuleSalesUnitId = "STK"
 	Set AxProduct.ItemDimCostPrice = "Nee"
 	Set AxProduct.ItemGroupId = "HG"
-	Set AxProduct.ItemId = ResultSet.GetDataByName("IdentNummer")
+	Set AxProduct.ItemId = Product.Basis.IdentNummer
 	Set AxProduct.ItemInventLocationId = "MAG2"
 	Set AxProduct.ItemType = "Artikel"
 	Set AxProduct.LowestQty = "1"
 	Set AxProduct.MinimumPalletQuantity = ""
 	Set AxProduct.ModelGroupId = "FIFO"
-	Set AxProduct.NameAlias = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(ResultSet.GetDataByName("KortTekst"))
-	Set AxProduct.NetWeight = ..NetWeight(ResultSet)
+	Set AxProduct.NameAlias = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(Product.Basis.KortTekst)
+	Set AxProduct.NetWeight = ..BepaalNetWeight(Product)
 	Set AxProduct.OrigCountryRegionId = ""
-	Set AxProduct.PmfProductType = ..PmfProductTypeHLX(ResultSet)
+	Set AxProduct.PmfProductType = ..BepaalPmfProductTypeHLX(Product)
 	Set AxProduct.ProdFlushingPrincip = "Finish"
 	Set AxProduct.PurchInventLocationId = "MAG2"
 	Set AxProduct.PurchSetupHighestQty = ""
@@ -269,7 +288,7 @@
 	Set AxProduct.PurchSetupOverride = ""
 	Set AxProduct.PurchSetupStandardQty = ""
 	Set AxProduct.PurchSetupStopped = ""
-	Set AxProduct.ReqGroupId = ..ReqGroupIdHLX(ResultSet)
+	Set AxProduct.ReqGroupId = ..BepaalReqGroupIdHLX(Product)
 	Set AxProduct.SalesInventLocationId = "MAG2"
 	Set AxProduct.SalesSetupHighestQty = ""
 	Set AxProduct.SalesSetupLeadTime = ""
@@ -278,9 +297,9 @@
 	Set AxProduct.SalesSetupOverride = ""
 	Set AxProduct.SalesSetupStandardQty = ""
 	Set AxProduct.SalesSetupStopped = ""
-	Set AxProduct.SearchName = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(ResultSet.GetDataByName("KortTekst"))
+	Set AxProduct.SearchName = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(Product.Basis.KortTekst)
 	Set AxProduct.Stopped = "Nee"
-	Set AxProduct.UOMSeqGroupId = ..UOMSeqGroupId(ResultSet)
+	Set AxProduct.UOMSeqGroupId = ..BepaalUOMSeqGroupId(Product)
 	Set AxProduct.UseAltItemId = "Nooit"
 	Set AxProduct.WMSLocationId = ""
 	Set AxProduct.ADUProductVersion = "1"
@@ -291,15 +310,26 @@
 ]]></Implementation>
 </Method>
 
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Onderstaande methods zijn NIET private gemaakt uit hoofde van:
+1. UnitTesting.
+2. Naamgeving: De methods zijn omwille van naamgeving niet in een aparte klasse gezet. De namen corresponderen met de properties zoals 
+voorzien in de methods Convert VanHoecke() en Convert Halux(), voorzien van de prefix "Bepaal". 1 uitzondering: BepaalVerpakking 
+(nodig voor verschillende volgende methods).
+*/
+]]></Content>
+</UDLText>
+
 <Method name="BepaalVerpakking">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim Verpakking As %String
-	#dim KleinVerpakking As %String = ResultSet.GetDataByName("KleinVerpakking")
-	#dim NormaleVerpakking As %String = ResultSet.GetDataByName("NormaleVerpakking")
-	#dim GrootVerpakking As %String = ResultSet.GetDataByName("GrootVerpakking")
+	#dim KleinVerpakking As %String = Product.Prijs.KleinVerpakking
+	#dim NormaleVerpakking As %String = Product.Prijs.NormaleVerpakking
+	#dim GrootVerpakking As %String = Product.Prijs.GrootVerpakking
 	
 	If ((KleinVerpakking '= "") && (KleinVerpakking '= "0")){
 		Set Verpakking = KleinVerpakking
@@ -314,474 +344,450 @@
 ]]></Implementation>
 </Method>
 
-<Method name="DefaultOrderTypeVH">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalDefaultOrderTypeVH">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim DefaultOrderTypeVH As %String
-	#dim LinkType As %String = ResultSet.GetDataByName("LinkType")
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
+	#dim BepaalDefaultOrderTypeVH As %String
+	#dim LinkType As %String = Product.Basis.LinkType
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
 	
-	If ((LinkType = "S") && (Leverancier = "6051")){
-		Set DefaultOrderTypeVH = "Productie"
+	If ((LinkType = "S") && (LeverancierNummer = "6051")){
+		Set BepaalDefaultOrderTypeVH = "Productie"
 	}
 	Else {
-		Set DefaultOrderTypeVH = "Aankooporder"
+		Set BepaalDefaultOrderTypeVH = "Aankooporder"
 	}
-	Quit DefaultOrderTypeVH
+	Quit BepaalDefaultOrderTypeVH
 ]]></Implementation>
 </Method>
 
-<Method name="DefaultOrderTypeHLX">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalDefaultOrderTypeHLX">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim DefaultOrderTypeHLX As %String
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
+	#dim BepaalDefaultOrderTypeHLX As %String
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
 	
-	If (Leverancier = 6332) {
-		Set DefaultOrderTypeHLX = "Productie"
+	If (LeverancierNummer = "6332") {
+		Set BepaalDefaultOrderTypeHLX = "Productie"
 	}
 	Else {
-		Set DefaultOrderTypeHLX = "Aankooporder"
+		Set BepaalDefaultOrderTypeHLX = "Aankooporder"
 	}
-	Quit DefaultOrderTypeHLX
+	Quit BepaalDefaultOrderTypeHLX
 ]]></Implementation>
 </Method>
 
-<Method name="Intracode">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalIntracode">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim Intracode As %String
-	#dim IntrastadID As %String = ResultSet.GetDataByName("IntrastatID")
+	#dim BepaalIntracode As %String
+	#dim IntrastadID As %String = Product.Basis.IntrastatID
 	
-    Set Intracode = $Piece($Get(^INTRAST(2,IntrastadID_" ")),"\",1)
-	Set Intracode = $Zstrip(Intracode,"*",".")
-	Quit Intracode
+    Set BepaalIntracode = $Piece($Get(^INTRAST(2,IntrastadID_" ")),"\",1)
+	Set BepaalIntracode = $Zstrip(BepaalIntracode,"*",".")
+	Quit BepaalIntracode
 ]]></Implementation>
 </Method>
 
-<Method name="InventItemInventSetupLowestQty">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalInventItemInventSetupLowestQty">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InventItemInventSetupLowestQty As %String
-	#dim VerpakkingsProduct As %String = ResultSet.GetDataByName("VerpakkingsProduct")
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
+	#dim BepaalInventItemInventSetupLowestQty As %String
+	#dim VerpakkingsProduct As %String = Product.Prijs.VerpakkingsProduct
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
 	
 	If (VerpakkingsProduct = ""){
-		Set InventItemInventSetupLowestQty = "1"
+		Set BepaalInventItemInventSetupLowestQty = "1"
 	}
-	ElseIf (Leverancier '= "5005"){
-		Set InventItemInventSetupLowestQty = "1"
+	ElseIf (LeverancierNummer '= "5005"){
+		Set BepaalInventItemInventSetupLowestQty = "1"
 		}
 	Else{
-		Set InventItemInventSetupLowestQty = ..BepaalVerpakking(ResultSet)
+		Set BepaalInventItemInventSetupLowestQty = ..BepaalVerpakking(Product)
 	}
-	Quit InventItemInventSetupLowestQty
+	Quit BepaalInventItemInventSetupLowestQty
 ]]></Implementation>
 </Method>
 
-<Method name="InventItemInventSetupStandardQty">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalInventItemInventSetupStandardQty">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InventItemInventSetupStandardQty As %String
-	#dim VerpakkingsProduct As %String = ResultSet.GetDataByName("VerpakkingsProduct")
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
+	#dim BepaalInventItemInventSetupStandardQty As %String
+	#dim VerpakkingsProduct As %String = Product.Prijs.VerpakkingsProduct
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
 	
 	If (VerpakkingsProduct = ""){
-		Set InventItemInventSetupStandardQty = "0"
+		Set BepaalInventItemInventSetupStandardQty = "0"
 	}
-	ElseIf (Leverancier '= "5005"){
-		Set InventItemInventSetupStandardQty = "0"
+	ElseIf (LeverancierNummer '= "5005"){
+		Set BepaalInventItemInventSetupStandardQty = "0"
 		}
 	Else {
-		Set InventItemInventSetupStandardQty = ..BepaalVerpakking(ResultSet)
+		Set BepaalInventItemInventSetupStandardQty = ..BepaalVerpakking(Product)
 	}
-	Quit InventItemInventSetupStandardQty
+	Quit BepaalInventItemInventSetupStandardQty
 ]]></Implementation>
 </Method>
 
-<Method name="PrimaryVendorIdVH">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalPrimaryVendorIdVH">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim PrimaryVendorIdVH As %String
-	#dim LinkType As %String = ResultSet.GetDataByName("LinkType")
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
+	#dim BepaalPrimaryVendorIdVH As %String
+	#dim LinkType As %String = Product.Basis.LinkType
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
 	
-	If (..DefaultOrderTypeVHProp = "Productie") {
-		Set PrimaryVendorIdVH = ""
+	If (..DefaultOrderTypeVH = "Productie") {
+		Set BepaalPrimaryVendorIdVH = ""
 	}
 	ElseIf ((LinkType = "HH") || (LinkType = "HHZ")) {
-		Set PrimaryVendorIdVH = "06332"
+		Set BepaalPrimaryVendorIdVH = "06332"
 	}
 	Else {
-		Set PrimaryVendorIdVH = ##class(TECH.StringUtils).AddLeadingChar(Leverancier,"0",5)
+		Set BepaalPrimaryVendorIdVH = ##class(TECH.StringUtils).AddLeadingChar(LeverancierNummer,"0",5)
 	}
-	Quit PrimaryVendorIdVH
+	Quit BepaalPrimaryVendorIdVH
 ]]></Implementation>
 </Method>
 
-<Method name="PrimaryVendorIdHLX">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalPrimaryVendorIdHLX">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim PrimaryVendorIdHLX As %String
-	#dim LinkType As %String = ResultSet.GetDataByName("LinkType")
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
+	#dim BepaalPrimaryVendorIdHLX As %String
+	#dim LinkType As %String = Product.Basis.LinkType
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
 	
-	If ((LinkType '= "HH") || (LinkType '= "HHZ")) {
-		Set PrimaryVendorIdHLX = "05497"
+	If ((LinkType '= "HH") && (LinkType '= "HHZ")) {
+		Set BepaalPrimaryVendorIdHLX = "05497"
 	}
-	ElseIf (..DefaultOrderTypeHLXProp = "Productie") {
-		Set PrimaryVendorIdHLX = ""
+	ElseIf (..DefaultOrderTypeHLX = "Productie") {
+		Set BepaalPrimaryVendorIdHLX = ""
 	}
 	Else {
-		Set Leverancier = ##class(AX.Uitgaand.PM.impl.ConvertorLeveranciersnummerVanHoeckeNaarHalux).%New().ConvertorLeveranciersnummerVanHoeckeNaarHalux(Leverancier)
-		Set PrimaryVendorIdHLX = ##class(TECH.StringUtils).AddLeadingChar(Leverancier,"0",5)
+		Set LeverancierNummer = ##class(AX.Uitgaand.PM.impl.ConvertorLeveranciersnummerVanHoeckeNaarHalux).%New().ConvertorLeveranciersnummerVanHoeckeNaarHalux(LeverancierNummer)
+		Set BepaalPrimaryVendorIdHLX = ##class(TECH.StringUtils).AddLeadingChar(LeverancierNummer,"0",5)
 	}
-	Quit PrimaryVendorIdHLX
+	Quit BepaalPrimaryVendorIdHLX
 ]]></Implementation>
 </Method>
 
-<Method name="InventItemPurchSetupLeadTimeVH">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalInventItemPurchSetupLeadTimeVH">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InventItemPurchSetupLeadTimeVH As %String
-	#dim LeveringsTermijn As %String = ResultSet.GetDataByName("LeveringsTermijn")
+	#dim BepaalInventItemPurchSetupLeadTimeVH As %String
+	#dim LeveringsTermijn As %String = Product.Prijs.LeveringsTermijn
 	
-	If (..PrimaryVendorIdVHProp = "05005") {
-		Set InventItemPurchSetupLeadTimeVH = LeveringsTermijn
+	If (..PrimaryVendorIdVH = "05005") {
+		Set BepaalInventItemPurchSetupLeadTimeVH = LeveringsTermijn
 	}
-	ElseIf ((..DefaultOrderTypeVHProp = "Aankooporder") && (..PrimaryVendorIdVHProp '= "06332") && (..PrimaryVendorIdVHProp '= "05005")) {
-		Set InventItemPurchSetupLeadTimeVH = LeveringsTermijn * 5
+	ElseIf ((..DefaultOrderTypeVH = "Aankooporder") && (..PrimaryVendorIdVH '= "06332")) {
+		Set BepaalInventItemPurchSetupLeadTimeVH = LeveringsTermijn * 5
 	}
 	Else {
-		Set InventItemPurchSetupLeadTimeVH = ""
+		Set BepaalInventItemPurchSetupLeadTimeVH = ""
 	}
-	Quit InventItemPurchSetupLeadTimeVH
+	Quit BepaalInventItemPurchSetupLeadTimeVH
 ]]></Implementation>
 </Method>
 
-<Method name="InventItemPurchSetupLeadTimeHLX">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalInventItemPurchSetupLeadTimeHLX">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InventItemPurchSetupLeadTimeHLX As %String
+	#dim BepaalInventItemPurchSetupLeadTimeHLX As %String
+	#dim LeveringsTermijn As %String = Product.Prijs.LeveringsTermijn
 	
-	If ((..DefaultOrderTypeHLXProp = "Aankooporder") && (..PrimaryVendorIdHLXProp '= "05497")) {
-		Set InventItemPurchSetupLeadTimeHLX = LeveringsTermijn * 5
+	If ((..DefaultOrderTypeHLX = "Aankooporder") && (..PrimaryVendorIdHLX '= "05497")) {
+		Set BepaalInventItemPurchSetupLeadTimeHLX = LeveringsTermijn * 5
 	}
 	Else {
-		Set InventItemPurchSetupLeadTimeHLX = ""
+		Set BepaalInventItemPurchSetupLeadTimeHLX = ""
 	}
-	Quit InventItemPurchSetupLeadTimeHLX
+	Quit BepaalInventItemPurchSetupLeadTimeHLX
 ]]></Implementation>
 </Method>
 
-<Method name="InventItemPurchSetupLowestQtyHLX">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalInventItemPurchSetupLowestQtyHLX">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InventItemPurchSetupLowestQtyHLX As %String
+	#dim BepaalInventItemPurchSetupLowestQtyHLX As %String
 	#dim AantalInTypeVerpakking As %Integer
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
-	#dim MinimumBestelhoeveelheid As %String = ResultSet.GetDataByName("MinimumBestelhoeveelheid")
-	#dim GrootVerpakking As %String = ResultSet.GetDataByName("GrootVerpakking")
-	#dim Kleinverpakking As %String = ResultSet.GetDataByName("Kleinverpakking")
-	#dim NormaleVerpakking As %String = ResultSet.GetDataByName("NormaleVerpakking")
-	#dim PalletAantal As %String = ResultSet.GetDataByName("PalletAantal")
+	#dim HerbestelSurplus As %String = Product.Basis.HerbestelSurplus
+	#dim MinimumBestelhoeveelheid As %String = Product.Prijs.MinimumBestelhoeveelheid
+	#dim GrootVerpakking As %String = Product.Prijs.GrootVerpakking
+	#dim Kleinverpakking As %String = Product.Prijs.KleinVerpakking
+	#dim NormaleVerpakking As %String = Product.Prijs.NormaleVerpakking
+	#dim PalletAantal As %String = Product.Basis.PalletAantal
 	
-	If (Leverancier = "6051") {
-		#dim Getal As %String = $Piece(MinimumBestelhoeveelheid,"*",1)
-		#dim Letter As %Integer = $Piece(MinimumBestelhoeveelheid,"*",2)
-		Set AantalInTypeVerpakking = $Case(Letter,"G":GrootVerpakking,"K":Kleinverpakking,"N":NormaleVerpakking,"P":PalletAantal)
-		Set InventItemPurchSetupLowestQtyHLX = Getal*AantalInTypeVerpakking
+	If (..PrimaryVendorIdHLX = "05497") {
+		#dim Getal As %String = $Extract(HerbestelSurplus,1,$Length(HerbestelSurplus)-1)
+		#dim Letter As %String = $Extract(HerbestelSurplus,$Length(HerbestelSurplus))
+		Set AantalInTypeVerpakking = $Case(Letter,"G":GrootVerpakking,"K":Kleinverpakking,"N":NormaleVerpakking,"P":PalletAantal,:1)
+		Set BepaalInventItemPurchSetupLowestQtyHLX = Getal*AantalInTypeVerpakking
 	}
 	Else {
-	Set InventItemPurchSetupLowestQtyHLX = MinimumBestelhoeveelheid
+	Set BepaalInventItemPurchSetupLowestQtyHLX = MinimumBestelhoeveelheid
 	}
-	Quit InventItemPurchSetupLowestQtyHLX
+	Quit BepaalInventItemPurchSetupLowestQtyHLX
 ]]></Implementation>
 </Method>
 
-<Method name="InventItemPurchSetupMultipleQtyHLX">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalInventItemPurchSetupMultipleQtyHLX">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InventItemPurchSetupMultipleQtyHLX As %String
+	#dim BepaalInventItemPurchSetupMultipleQtyHLX As %String
 	#dim AantalInTypeVerpakking As %Integer
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
-	#dim Herbestelafronding As %String = ResultSet.GetDataByName("Herbestelafronding")
-	#dim GrootVerpakking As %String = ResultSet.GetDataByName("GrootVerpakking")
+	#dim HerbestelAfronding As %String = Product.Basis.HerbestelAfronding
+	#dim GrootVerpakking As %String = Product.Prijs.GrootVerpakking
+	#dim Kleinverpakking As %String = Product.Prijs.KleinVerpakking
+	#dim NormaleVerpakking As %String = Product.Prijs.NormaleVerpakking
+	#dim PalletAantal As %String = Product.Basis.PalletAantal
 	
-	If (Leverancier = "6051") {
-		#dim Getal As %String = $Piece(Herbestelafronding,"*",1)
-		#dim Letter As %Integer = $Piece(Herbestelafronding,"*",2)
-		Set AantalInTypeVerpakking = $Case(Letter,"G":GrootVerpakking,"K":Kleinverpakking,"N":NormaleVerpakking,"P":PalletAantal,"S":1)
-		Set InventItemPurchSetupMultipleQtyHLX = Getal*AantalInTypeVerpakking
+	If (..PrimaryVendorIdHLX = "05497") {
+		#dim Getal As %String = $Extract(HerbestelAfronding,1,$Length(HerbestelAfronding)-1)
+		#dim Letter As %String = $Extract(HerbestelAfronding,$Length(HerbestelAfronding))
+		Set AantalInTypeVerpakking = $Case(Letter,"G":GrootVerpakking,"K":Kleinverpakking,"N":NormaleVerpakking,"P":PalletAantal,"S":1,:1)
+		Set BepaalInventItemPurchSetupMultipleQtyHLX = Getal*AantalInTypeVerpakking
 	}
 	Else {
-	Set InventItemPurchSetupMultipleQtyHLX = GrootVerpakking
+	Set BepaalInventItemPurchSetupMultipleQtyHLX = GrootVerpakking
 	}
-	Quit InventItemPurchSetupMultipleQtyHLX
+	Quit BepaalInventItemPurchSetupMultipleQtyHLX
 ]]></Implementation>
 </Method>
 
-<Method name="InventItemPurchSetupStopped">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalInventItemPurchSetupStopped">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InventItemPurchSetupStopped As %String
-	#dim Uitverkoop As %String = ResultSet.GetDataByName("Uitverkoop")
+	#dim BepaalInventItemPurchSetupStopped As %String
+	#dim Uitverkoop As %String = Product.Basis.Uitverkoop
 	
 	If (Uitverkoop = "") {
-		Set InventItemPurchSetupStopped = "Nee"
+		Set BepaalInventItemPurchSetupStopped = "Nee"
 	}
 	Else {
-		Set InventItemPurchSetupStopped = "Ja"
+		Set BepaalInventItemPurchSetupStopped = "Ja"
 	}
-	Quit InventItemPurchSetupStopped
+	Quit BepaalInventItemPurchSetupStopped
 ]]></Implementation>
 </Method>
 
-<Method name="InventItemSalesSetupLowestQtyVH">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalInventItemSalesSetupLowestQtyVH">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InventItemSalesSetupLowestQtyVH As %String
-	#dim StockNietStock As %String = ResultSet.GetDataByName("StockNietStock")
-	#dim MinimumBestelhoeveelheid As %String = ResultSet.GetDataByName("MinimumBestelhoeveelheid")
-	#dim Verpakkingsproduct As %String = ResultSet.GetDataByName("Verpakkingsproduct")
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
+	#dim BepaalInventItemSalesSetupLowestQtyVH As %String
+	#dim StockNietStock As %String = Product.Basis.StockNietStock
+	#dim MinimumBestelhoeveelheid As %String = Product.Prijs.MinimumBestelhoeveelheid
+	#dim VerpakkingsProduct As %String = Product.Prijs.VerpakkingsProduct
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
 	
 	If (StockNietStock '= "1") {
-		Set InventItemSalesSetupLowestQtyVH = MinimumBestelhoeveelheid
+		Set BepaalInventItemSalesSetupLowestQtyVH = MinimumBestelhoeveelheid
+	} ElseIf ((VerpakkingsProduct '= "") && (LeverancierNummer = "5005")) {
+		Set BepaalInventItemSalesSetupLowestQtyVH = ..BepaalVerpakking(Product)
+	} Else {
+		Set BepaalInventItemSalesSetupLowestQtyVH = "1"
 	}
-	ElseIf (Verpakkingsproduct '= "" && Leverancier = "5005") {
-		Set InventItemSalesSetupLowestQtyVH = ..BepaalVerpakking(ResultSet)
-	}
-	Else {
-		Set InventItemSalesSetupLowestQtyVH = "1"
-	}
-	Quit InventItemSalesSetupLowestQtyVH
+	Quit BepaalInventItemSalesSetupLowestQtyVH
 ]]></Implementation>
 </Method>
 
-<Method name="InventItemSalesSetupMultipleQtyVH">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalInventItemSalesSetupMultipleQtyVH">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InventItemSalesSetupMultipleQtyVH As %String
-	#dim StockNietStock As %String = ResultSet.GetDataByName("StockNietStock")
-	#dim MinimumBestelhoeveelheid As %String = ResultSet.GetDataByName("MinimumBestelhoeveelheid")
-	#dim Verpakkingsproduct As %String = ResultSet.GetDataByName("Verpakkingsproduct")
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
-	#dim KSPrijslijst As %String = ResultSet.GetDataByName("KSPrijslijst")
+	#dim BepaalInventItemSalesSetupMultipleQtyVH As %String
+	#dim StockNietStock As %String = Product.Basis.StockNietStock
+	#dim MinimumBestelhoeveelheid As %String = Product.Prijs.MinimumBestelhoeveelheid
+	#dim VerpakkingsProduct As %String = Product.Prijs.VerpakkingsProduct
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
+	#dim KSPrijslijst As %String = Product.Basis.KSPrijsLijst
 	
-	If (((Verpakkingsproduct = "") && (StockNietStock '= "1")) || ((Verpakkingsproduct '= "") && (StockNietStock '= "1") && (Leverancier '= "5005"))) {
-		Set InventItemSalesSetupMultipleQtyVH = ..BepaalVerpakking(ResultSet)
+	If (((VerpakkingsProduct = "") && (StockNietStock '= "1")) || ((VerpakkingsProduct '= "") && (StockNietStock '= "1") && (LeverancierNummer '= "5005"))) {
+		Set BepaalInventItemSalesSetupMultipleQtyVH = ..BepaalVerpakking(Product)
 	}
-	ElseIf (((Verpakkingsproduct = "") && (KSPrijslijst = "1")) || ((Verpakkingsproduct '= "") && (KSPrijslijst = "1") && (Leverancier '= "5005"))) {
-		Set InventItemSalesSetupMultipleQtyVH = "1"
+	ElseIf (((VerpakkingsProduct = "") && (KSPrijslijst = "1")) || ((VerpakkingsProduct '= "") && (KSPrijslijst = "1") && (LeverancierNummer '= "5005"))) {
+		Set BepaalInventItemSalesSetupMultipleQtyVH = "1"
 	}
-	ElseIf (((Verpakkingsproduct = "") && (KSPrijslijst '= "1")) || ((Verpakkingsproduct '= "") && (KSPrijslijst '= "1") && (Leverancier '= "5005"))) {
-		Set InventItemSalesSetupMultipleQtyVH = ..BepaalVerpakking(ResultSet)
+	ElseIf (((VerpakkingsProduct = "") && (KSPrijslijst '= "1")) || ((VerpakkingsProduct '= "") && (KSPrijslijst '= "1") && (LeverancierNummer '= "5005"))) {
+		Set BepaalInventItemSalesSetupMultipleQtyVH = ..BepaalVerpakking(Product)
 	}
-	ElseIf ((Verpakkingsproduct '= "") && (Leverancier = "5005")) {
-		Set InventItemSalesSetupMultipleQtyVH = ..BepaalVerpakking(ResultSet)
+	ElseIf ((VerpakkingsProduct '= "") && (LeverancierNummer = "5005")) {
+		Set BepaalInventItemSalesSetupMultipleQtyVH = ..BepaalVerpakking(Product)
 	}
 	Else {
-		Set InventItemSalesSetupMultipleQtyVH = "1"
+		Set BepaalInventItemSalesSetupMultipleQtyVH = "1" // Wellicht onmogelijk, lus komt nooit hierin, dus ook geen test voor deze mogelijkheid. Laten staan, just in case.
 	}
-	Quit InventItemSalesSetupMultipleQtyVH
+	Quit BepaalInventItemSalesSetupMultipleQtyVH
 ]]></Implementation>
 </Method>
 
-<Method name="NetWeight">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalNetWeight">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim NetWeight As %String
-	#dim GewichtPerDuizendStuksInKG As %String = ResultSet.GetDataByName("GewichtPerDuizendStuksInKG")
+	#dim BepaalNetWeight As %String
+	#dim GewichtPerDuizendStuksInKG As %String = Product.Basis.GewichtPerDuizendStuksInKG
 	
-	Set NetWeight = GewichtPerDuizendStuksInKG / 1000
-	Quit NetWeight
+	Set BepaalNetWeight = GewichtPerDuizendStuksInKG / 1000
+	Quit BepaalNetWeight
 ]]></Implementation>
 </Method>
 
-<Method name="PmfProductTypeVH">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalPmfProductTypeVH">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim PmfProductTypeVH As %String
+	#dim BepaalPmfProductTypeVH As %String
 	
-	If (..DefaultOrderTypeVHProp = "Aankooporder") {
-		Set PmfProductTypeVH = "Geen"
+	If (..DefaultOrderTypeVH = "Aankooporder") {
+		Set BepaalPmfProductTypeVH = "Geen"
 	}
-	ElseIf (..DefaultOrderTypeVHProp = "Productie") {
-		Set PmfProductTypeVH = "Stuklijst"
+	ElseIf (..DefaultOrderTypeVH = "Productie") {
+		Set BepaalPmfProductTypeVH = "Stuklijst"
 	}
-	Quit PmfProductTypeVH
+	Quit BepaalPmfProductTypeVH
 ]]></Implementation>
 </Method>
 
-<Method name="PmfProductTypeHLX">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalPmfProductTypeHLX">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim PmfProductTypeHLX As %String
+	#dim BepaalPmfProductTypeHLX As %String
 	
-	If (..DefaultOrderTypeHLXProp = "Aankooporder") {
-		Set PmfProductTypeHLX = "Geen"
+	If (..DefaultOrderTypeHLX = "Aankooporder") {
+		Set BepaalPmfProductTypeHLX = "Geen"
 	}
-	ElseIf (..DefaultOrderTypeHLXProp = "Productie") {
-		Set PmfProductTypeHLX = "Stuklijst"
+	ElseIf (..DefaultOrderTypeHLX = "Productie") {
+		Set BepaalPmfProductTypeHLX = "Stuklijst"
 	}
-	Quit PmfProductTypeHLX
+	Quit BepaalPmfProductTypeHLX
 ]]></Implementation>
 </Method>
 
-<Method name="ReqGroupIdVH">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalReqGroupIdVH">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim ReqGroupIdVH As %String
-	#dim StockNietStock As %String = ResultSet.GetDataByName("StockNietStock")
-	#dim SubGroep As %String = ResultSet.GetDataByName("SubGroep")
+	#dim BepaalReqGroupIdVH As %String
+	#dim StockNietStock As %String = Product.Basis.StockNietStock
+	#dim SubGroep As %String = Product.Klassificatie.SubGroep
 	#dim SubGroepLaatsteDrieKarakters As %String = $Extract(SubGroep,$Length(SubGroep)-2,$Length(SubGroep))
 	#dim BevatVPK As %Integer = $Find(SubGroep,"VPK/")
 	#dim BevatVPA As %Integer = $Find(SubGroep,"VPA/")
-	#dim ScanType As %String = ResultSet.GetDataByName("ScanType")
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
+	#dim ScanType As %String = Product.Basis.ScanType
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
 	
-	If ((SubGroepLaatsteDrieKarakters = "/OL") && (Leverancier = "6051") && (..DefaultOrderTypeVHProp = "Productie")) {
-		Set ReqGroupIdVH = "MTO"
+	If ((SubGroepLaatsteDrieKarakters = "/OL") && (LeverancierNummer = "6051") && (..DefaultOrderTypeVH = "Productie")) {
+		Set BepaalReqGroupIdVH = "MTO"
 	}
-	ElseIf (((BevatVPK '= 0) || (BevatVPK '= 0)) && (..DefaultOrderTypeVHProp = "Aankooporder")) {
-		Set ReqGroupIdVH = "Handmatig"
+	ElseIf (((BevatVPK '= 0) || (BevatVPA '= 0)) && (..DefaultOrderTypeVH = "Aankooporder")) {
+		Set BepaalReqGroupIdVH = "Handmatig"
 	}
-	ElseIf ((StockNietStock '= "1") && (..DefaultOrderTypeVHProp = "Aankooporder")) {
-		Set ReqGroupIdVH = "BTO"
+	ElseIf ((StockNietStock '= "1") && (..DefaultOrderTypeVH = "Aankooporder")) {
+		Set BepaalReqGroupIdVH = "BTO"
 	}
-	ElseIf ((StockNietStock = "1") && (ScanType > 0) && (..DefaultOrderTypeVHProp = "Aankooporder")) {
-		Set ReqGroupIdVH = "Min/Max"
+	ElseIf ((StockNietStock = "1") && (ScanType > 0) && (..DefaultOrderTypeVH = "Aankooporder")) {
+		Set BepaalReqGroupIdVH = "Min/Max"
 	}
-	ElseIf ((StockNietStock = "1") && (..DefaultOrderTypeVHProp = "Aankooporder")) {
-		Set ReqGroupIdVH = "BTS-1W"
+	ElseIf ((StockNietStock = "1") && (..DefaultOrderTypeVH = "Aankooporder")) {
+		Set BepaalReqGroupIdVH = "BTS-1W"
 	}
 	Else {
-		Set ReqGroupIdVH = "Handmatig"
+		Set BepaalReqGroupIdVH = "Handmatig"
 	}
-	Quit ReqGroupIdVH
+	Quit BepaalReqGroupIdVH
 ]]></Implementation>
 </Method>
 
-<Method name="ReqGroupIdHLX">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalReqGroupIdHLX">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim ReqGroupIdHLX As %String
-	#dim StockNietStock As %String = ResultSet.GetDataByName("StockNietStock")
-	#dim SubGroep As %String = ResultSet.GetDataByName("SubGroep")
+	#dim BepaalReqGroupIdHLX As %String
+	#dim StockNietStock As %String = Product.Basis.StockNietStock
+	#dim SubGroep As %String = Product.Klassificatie.SubGroep
 	#dim SubGroepEersteVierKarakters As %String = $Extract(SubGroep,1,4)
 	#dim BevatVPK As %Integer = $Find(SubGroep,"VPK/")
 	#dim BevatVPA As %Integer = $Find(SubGroep,"VPA/")
-	#dim Herbestelsurplus As %String = ResultSet.GetDataByName("Herbestelsurplus")
-	#dim Herbestelafronding As %String = ResultSet.GetDataByName("Herbestelafronding")
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
+	#dim Herbestelsurplus As %String = Product.Basis.HerbestelSurplus
+	#dim Herbestelafronding As %String = Product.Basis.HerbestelAfronding
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
 	
 	If ((StockNietStock = "1") && (SubGroepEersteVierKarakters = "12AL")) {
-		Set ReqGroupIdHLX = "MTS-1W"
+		Set BepaalReqGroupIdHLX = "MTS-1W"
 	}
-	ElseIf (((BevatVPK '= 0) || (BevatVPK '= 0)) && (..DefaultOrderTypeHLXProp ="Aankooporder")) {
-		Set ReqGroupIdHLX = "Handmatig"
+	ElseIf (((BevatVPK '= 0) || (BevatVPA '= 0)) && (..DefaultOrderTypeHLX ="Aankooporder")) {
+		Set BepaalReqGroupIdHLX = "Handmatig"
 	}
-	ElseIf ((Herbestelsurplus = "") && (Herbestelafronding ="") && (Leverancier = "6051")) {
-		Set ReqGroupIdHLX = "BTO"
+	ElseIf ((Herbestelsurplus = "") && (Herbestelafronding ="") && (LeverancierNummer = "6051")) {
+		Set BepaalReqGroupIdHLX = "BTO"
 	}
 	Else {
-		Set ReqGroupIdHLX = "BTS-2D"
+		Set BepaalReqGroupIdHLX = "BTS-2D"
 	}
-	Quit ReqGroupIdHLX
+	Quit BepaalReqGroupIdHLX
 ]]></Implementation>
 </Method>
 
-<Method name="UOMSeqGroupId">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalUOMSeqGroupId">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim UOMSeqGroupId As %String
-	#dim Kleinverpakking As %String = ResultSet.GetDataByName("Kleinverpakking")
-	#dim NormaleVerpakking As %String = ResultSet.GetDataByName("NormaleVerpakking")
-	#dim GrootVerpakking As %String = ResultSet.GetDataByName("GrootVerpakking")
-	#dim PalletAantal As %String = ResultSet.GetDataByName("PalletAantal")
+	#dim BepaalUOMSeqGroupId As %String
+	#dim KleinVerpakking As %Integer = +Product.Prijs.KleinVerpakking
+	#dim NormaleVerpakking As %Integer = +Product.Prijs.NormaleVerpakking
+	#dim GrootVerpakking As %Integer = +Product.Prijs.GrootVerpakking
+	#dim PalletAantal As %Integer = +Product.Basis.PalletAantal
 	
-	If (((Kleinverpakking = "0") || (Kleinverpakking = "")) && ((NormaleVerpakking = "0") || (NormaleVerpakking = "1") || (NormaleVerpakking = "")) 
-	&& (GrootVerpakking > 0) && ((PalletAantal = "0") || (PalletAantal = ""))) {
-		Set UOMSeqGroupId = "STK-GVP"
+	If ((KleinVerpakking = 0) && (NormaleVerpakking < 2) && (PalletAantal = 0)) {
+		Set BepaalUOMSeqGroupId = "STK-GVP"
 	}
-	ElseIf (((Kleinverpakking = 0) || (Kleinverpakking = "")) && ((NormaleVerpakking = 0) || (NormaleVerpakking = "")) 
-	&& (GrootVerpakking > 0) && (PalletAantal > 0)) {
-		Set UOMSeqGroupId = "STK-GVP-PLT"
+	ElseIf ((KleinVerpakking = 0) && (NormaleVerpakking = 0) && (PalletAantal > 0)) {
+		Set BepaalUOMSeqGroupId = "STK-GVP-PLT"
 	}
-	ElseIf (((Kleinverpakking = "0") || (Kleinverpakking = "")) && (NormaleVerpakking = "1") 
-	&& (GrootVerpakking > 0) && (PalletAantal > 0)) {
-		Set UOMSeqGroupId = "STK-GVP-PLT"
+	ElseIf ((KleinVerpakking = 0) && (NormaleVerpakking = 1) && (PalletAantal > 0)) {
+		Set BepaalUOMSeqGroupId = "STK-GVP-PLT"
 	}
-	ElseIf (((Kleinverpakking = "0") || (Kleinverpakking = "")) && (NormaleVerpakking > 1) 
-	&& (GrootVerpakking > 0) && (PalletAantal > 0)) {
-		Set UOMSeqGroupId = "STK-KVP-GVP-PLT"
+	ElseIf ((KleinVerpakking = 0) && (NormaleVerpakking > 1) && (PalletAantal > 0)) {
+		Set BepaalUOMSeqGroupId = "STK-KVP-GVP-PLT"
 	}
-	ElseIf ((Kleinverpakking > 0) && (NormaleVerpakking > 0) && (GrootVerpakking > 0) && (PalletAantal > 0)) {
-		Set UOMSeqGroupId = "STK-KVP-NVP-GVP-PLT"
+	ElseIf ((KleinVerpakking > 0) && (NormaleVerpakking > 0) && (PalletAantal > 0)) {
+		Set BepaalUOMSeqGroupId = "STK-KVP-NVP-GVP-PLT"
 	}
 	Else {
-		Set UOMSeqGroupId = "Not properly formated"
+		Set BepaalUOMSeqGroupId = ""
 	}
-	Quit UOMSeqGroupId
+	Quit BepaalUOMSeqGroupId
 ]]></Implementation>
 </Method>
 
-<Method name="InventItemPurchSetupCalendarDaysVH">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
-<Private>1</Private>
+<Method name="BepaalInventItemPurchSetupCalendarDaysVH">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InventItemPurchSetupCalendarDaysVH As %String
-	#dim Leverancier As %String = ResultSet.GetDataByName("Leverancier")
+	#dim BepaalInventItemPurchSetupCalendarDaysVH As %String
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
 	
-	If (Leverancier = 5005) {
-		Set InventItemPurchSetupCalendarDaysVH = "0"
+	If (LeverancierNummer = "5005") {
+		Set BepaalInventItemPurchSetupCalendarDaysVH = "0"
 	}
 	Else {
-		Set InventItemPurchSetupCalendarDaysVH = "1"
+		Set BepaalInventItemPurchSetupCalendarDaysVH = "1"
 	}
-	Quit InventItemPurchSetupCalendarDaysVH
+	Quit BepaalInventItemPurchSetupCalendarDaysVH
 ]]></Implementation>
 </Method>
 </Class>