Index: vhTest/Fake/DOM/PM/impl/ProductTypeAPIimpl.cls.xml
===================================================================
diff -u -r68048 -r68058
--- vhTest/Fake/DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 68048)
+++ vhTest/Fake/DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 68058)
@@ -28,16 +28,16 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsInkortingProduct">
+<Method name="GeefLegraboxProduct">
 <FormalSpec>ProductID:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
+<ReturnType>DOM.PM.LBXProduct.LBXLade</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
-<Method name="IsProductMetBewerkingInSpecialWorkshop">
+<Method name="GeefMaatwerkProduct">
 <FormalSpec>ProductID:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
+<ReturnType>DOM.PM.MaatwerkProduct</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -49,48 +49,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsMerivoboxProduct">
-<FormalSpec>ProductID:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
-
-<Method name="IsCabloxxProduct">
-<FormalSpec>UniekeClassificatieCode:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
-
-<Method name="GeefSpaceTowerProductNrLijstVoorLade">
-<FormalSpec>ProductID:%String</FormalSpec>
-<ReturnType>%ListOfDataTypes</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
-
-<Method name="GeefSpaceTowerProductNrVoorLade">
-<FormalSpec>ProductID:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
-
-<Method name="GeefLegraboxProduct">
-<FormalSpec>ProductID:%String</FormalSpec>
-<ReturnType>DOM.PM.LBXProduct.LBXLade</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
-
-<Method name="GeefMaatwerkProduct">
-<FormalSpec>ProductID:%String</FormalSpec>
-<ReturnType>DOM.PM.MaatwerkProduct</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
-
 <Method name="GeefOrgaluxProduct">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>DOM.PM.OLProduct.OLProduct</ReturnType>
@@ -112,6 +70,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefSpaceTowerProductNrLijstVoorLade">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefTAORboxProduct">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>DOM.PM.TAORProduct.TAORLade</ReturnType>
@@ -168,6 +133,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsInkortingProduct">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="IsKaderdeurProduct">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
@@ -210,6 +182,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsMerivoboxProduct">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="IsOrgaluxOpMaat">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
@@ -224,6 +203,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsProductMetBewerkingInSpecialWorkshop">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="IsServoDriveFlex">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: DOM/PM/impl/ProductTypeAPIimpl.cls.xml
===================================================================
diff -u -r68048 -r68058
--- DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 68048)
+++ DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 68058)
@@ -131,8 +131,9 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Do ..ControleerOfProductBestaat(ProductID)
-	#dim GenType As %String = $$GENTYP^HAD(ProductID,,1)
-	Quit ($Piece(GenType,"\",1) = "INK")
+	#dim GenType As %String = $P($$GENTYP^HAD(ProductID,,1),"\",1,2)
+	
+	Quit (GenType = "DIV\ZSN")
 ]]></Implementation>
 </Method>
 
@@ -334,6 +335,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefInkortingProduct">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>DOM.PM.INKProduct.INKIngekort</ReturnType>
+<Implementation><![CDATA[
+	If ('..IsInkortingProduct(ProductID)) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Product "_ProductID_" is geen Inkorting product"))
+	Quit ##class(DOM.PM.INKProduct.impl.INKIngekort).OpenId(ProductID)
+]]></Implementation>
+</Method>
+
 <Method name="IsAntislipmatProduct">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: vhUnitTest/DOM/PM/MaatwerkProduct/GeefHalffabItemsBoom/Test.cls.xml
===================================================================
diff -u -r64830 -r68058
--- vhUnitTest/DOM/PM/MaatwerkProduct/GeefHalffabItemsBoom/Test.cls.xml	(.../Test.cls.xml)	(revision 64830)
+++ vhUnitTest/DOM/PM/MaatwerkProduct/GeefHalffabItemsBoom/Test.cls.xml	(.../Test.cls.xml)	(revision 68058)
@@ -40,6 +40,7 @@
 		continue:##class(TECH.StringUtils).StartsWith(ClassName,"DOM.PM.TBXProduct")
 		continue:ClassName=##class(DOM.PM.impl.MaatwerkProductImpl).%ClassName(1)
 		continue:ClassName=##class(DOM.PM.MVXProduct.impl.MVXLadeImpl).%ClassName(1)
+		continue:ClassName=##class(DOM.PM.INKProduct.impl.INKIngekort).%ClassName(1)
 
 		#dim PrijsBerekening As DOM.PM.Maatwerk.Calc.Common.enu.BerekeningWijze = ##class(DOM.PM.Maatwerk.Calc.Common.enu.BerekeningWijze).PrijsBerekening()
 		#dim ProductieAansturing As DOM.PM.Maatwerk.Calc.Common.enu.BerekeningWijze = ##class(DOM.PM.Maatwerk.Calc.Common.enu.BerekeningWijze).ProductieAansturing()