Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r58141 -r58142
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 58141)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 58142)
@@ -176,7 +176,7 @@
 		Do ..ConvertTranslation(Product, ##class(TECH.ListIterator).%New(ProductItem.Translation)) ; ok
 
 		#dim Filter as TECH.Filter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.ExtFilter).Maak("Vend","VendGroup")
-		Do ..ConvertExtModuleTypeVend(Product, ##class(TECH.DynamicIterator).%New(##class(TECH.ListIterator).%New(ProductItem.Ext),"",Filter))
+		Do ..ZetLeverancierReferentieEnBestelReferentie(ProductItem.ProdInstruction,Product, ##class(TECH.DynamicIterator).%New(##class(TECH.ListIterator).%New(ProductItem.Ext),"",Filter))
 		
 		Do Product.Save()
 		Do ..MaakIndexen(Product.GeefID())
@@ -266,21 +266,26 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ConvertExtModuleTypeVend">
-<FormalSpec>Product:DOM.PM.Product,ExtIterator:TECH.ListIterator</FormalSpec>
+<Method name="ZetLeverancierReferentieEnBestelReferentie">
+<FormalSpec>ProdInstruction:%String,Product:DOM.PM.Product,ExtIterator:TECH.ListIterator</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	if ExtIterator.HasNext() {
-		#dim Ext as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityExt = ExtIterator.Next()
-		Do Product.ZetLeverancierReferentie(Ext.ExternalItemId)
-		#dim GekuisteReferentie as %String = ##class(TECH.StringUtils).Replace(Ext.ExternalItemTxt,$c(10),"~")
-		Do ..LangtekstBewaarder.BewaarBestelReferentie(Product.GeefID(),GekuisteReferentie)
-		if ExtIterator.HasNext(){
-			;there can be only one?
-		}
-	} else {
+	If $$$HasLength(ProdInstruction){
 		Do Product.ZetLeverancierReferentie("")
-		Do ..LangtekstBewaarder.BewaarBestelReferentie(Product.GeefID(),"")
+		Do ..LangtekstBewaarder.BewaarBestelReferentie(Product.GeefID(),##class(TECH.StringUtils).Replace(ProdInstruction,$c(10),"~"))
+	} Else {
+		if ExtIterator.HasNext() {
+			#dim Ext as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityExt = ExtIterator.Next()
+			Do Product.ZetLeverancierReferentie(Ext.ExternalItemId)
+			#dim GekuisteReferentie as %String = ##class(TECH.StringUtils).Replace(Ext.ExternalItemTxt,$c(10),"~")
+			Do ..LangtekstBewaarder.BewaarBestelReferentie(Product.GeefID(),GekuisteReferentie)
+			if ExtIterator.HasNext(){
+				;there can be only one?
+			}
+		} else {
+			Do Product.ZetLeverancierReferentie("")
+			Do ..LangtekstBewaarder.BewaarBestelReferentie(Product.GeefID(),"")
+		}
 	}
 ]]></Implementation>
 </Method>
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml
===================================================================
diff -u -r58141 -r58142
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml	(.../MappingTest.cls.xml)	(revision 58141)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml	(.../MappingTest.cls.xml)	(revision 58142)
@@ -747,6 +747,35 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test aanwezigheid ProdInstruction maakt LeveranciersRef leeg en vult Bestelreferentie">
+<Implementation><![CDATA[
+	Set ..ProductItem.ProdInstruction = "ProdInstruction"  _ $$$CRLF _ "ProdInstruction Lijn2"	
+	Do ..LangtekstBewaarderMock.VerwachtMethodCall("BewaarBestelReferentie","ProductID","ProdInstruction" _ $Char(13) _ "~ProdInstruction Lijn2").DanDoeNiks()
+	
+	Do ..ProductMock.VerwachtMethodCall("ZetLeverancierReferentie","").DanDoeNiks()
+
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
+
+	Do ..ProductMock.Verifieer()
+	Do ..LangtekstBewaarderMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test afwezigheid ProdInstruction en Exttag type Vend maakt LeveranciersRef en Bestelreferentie leeg ">
+<Implementation><![CDATA[
+	Set ..ProductItem.ProdInstruction = ""	
+	Set ..ProductItem.Ext = ##class(%ListOfDataTypes).%New()
+
+	Do ..LangtekstBewaarderMock.VerwachtMethodCall("BewaarBestelReferentie","ProductID","").DanDoeNiks()	
+	Do ..ProductMock.VerwachtMethodCall("ZetLeverancierReferentie","").DanDoeNiks()
+
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
+
+	Do ..ProductMock.Verifieer()
+	Do ..LangtekstBewaarderMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefTeConverterenProductItem">
 <Implementation><![CDATA[
 	Set ProductItem = ##class(AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem).%New()