Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml
===================================================================
diff -u -r72684 -r72718
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 72684)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 72718)
@@ -245,7 +245,7 @@
 	Set ListIterator = ##class(TECH.ListIterator).%New(ListOfProducts)
 	
 	Set ProductRepositoryMock = ##class(vhTest.Mock.Prod.ProductRepository).%New()
-	Do ProductRepositoryMock.VerwachtMethodCall("ZoekViaDossierCode","ABCDE").DanReturn(ListIterator)
+	Do ProductRepositoryMock.VerwachtMethodCall("ZoekViaDossierCode","ABCDE", "LBX").DanReturn(ListIterator)
 	
 	Set ProductTypeAPIMock = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
 	Do ProductTypeAPIMock.VerwachtMethodCall("IsLegraboxProduct","123456").DanReturn($$$True)
Index: vhTest/Mock/Prod/ProductRepository.cls.xml
===================================================================
diff -u -r72682 -r72718
--- vhTest/Mock/Prod/ProductRepository.cls.xml	(.../ProductRepository.cls.xml)	(revision 72682)
+++ vhTest/Mock/Prod/ProductRepository.cls.xml	(.../ProductRepository.cls.xml)	(revision 72718)
@@ -74,9 +74,9 @@
 </Method>
 
 <Method name="ZoekViaDossierCode">
-<FormalSpec>DossierCode:TECH.String</FormalSpec>
+<FormalSpec>DossierCode:TECH.String,GenType:TECH.String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaDossierCode",DossierCode)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaDossierCode",DossierCode,GenType)
 ]]></Implementation>
 </Method>
 </Class>
Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r72684 -r72718
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 72684)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 72718)
@@ -563,10 +563,8 @@
 		#dim IsAdminProductNummerMeegegeven As %Boolean = $$$HasLength(..GeefAttributeValue(OrderLine.Attribute,"AdminProductNummer"))
 		#dim MaatwerkProduct As DOM.PM.MaatwerkProduct
 		
-		If ((IsEenMaatwerkLijn) && $$$Not(CID = "")) {
-			If (ReedsGekendeProductId > 0) {
-				Do PrijsOrderLijn.ZetProductID(ProductId, $$$True)
-			}
+		If ((IsEenMaatwerkLijn) && $$$Not(CID = "") && (ReedsGekendeProductId > 0)) {
+			Do PrijsOrderLijn.ZetProductID(ProductId, $$$True)
 		} ElseIf (IsEenMaatwerkLijn && IsAdminProductNummerMeegegeven) {
 			Do PrijsOrderLijn.ZetProductID(..GeefAttributeValue(OrderLine.Attribute,"AdminProductNummer"), $$$True)
 		}
@@ -956,7 +954,8 @@
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
 	#dim ProductId As %Integer = 0
-	#dim ProductenIterator As TECH.Iterator = ..ProductRepository.ZoekViaDossierCode(DossierCode)
+	#dim GenType As %String = $Piece(MaatwerkModel, "_", 2)
+	#dim ProductenIterator As TECH.Iterator = ..ProductRepository.ZoekViaDossierCode(DossierCode, GenType)
 	
 	While ProductenIterator.HasNext() {
 		#dim Product As Prod.Product = ProductenIterator.Next()