Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml
===================================================================
diff -u -r47614 -r47622
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47614)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47622)
@@ -15,8 +15,8 @@
 	Set SOPR.SOPR= ##class(%ListOfDataTypes).%New()
 	
 	Set ProductItemConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter).%New()
-	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(Principaal),).DanDoeNiks().ExactAantalKeer(1)
-	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(SOPR)).DanDoeNiks().Nooit()
+	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(Principaal),"vhbe").DanDoeNiks().ExactAantalKeer(1)
+	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(SOPR),"vhbe").DanDoeNiks().Nooit()
 	
 	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
 	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","IdentNummer","L||5005","vhbe-08614").DanReturn("")
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml
===================================================================
diff -u -r47614 -r47622
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47614)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47622)
@@ -3,7 +3,7 @@
 <Class name="vhUnitTest.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="aTest ProductConverter slaat producten met leverancier Halux over voor legale entiteit VHBE">
+<Method name="Test ProductConverter slaat producten met leverancier Halux over voor legale entiteit VHBE">
 <Implementation><![CDATA[
 	#dim ProductAPIMock as DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
 	#dim ProductRolAPIMock as DOM.PM.ProductRolAPI = ##class(vhTest.Mock.DOM.PM.ProductRolAPI).MockInstance()
@@ -73,7 +73,7 @@
 	
 	#dim Envelope as AXif.Dynamics.ProductItemIn.Envelope = ..GeefEnvelope("ProductItemInUpdateKorttekst.xml")
 
-	Do Converter.ConvertProductItem(Envelope.Body.MessageParts.MessagePart.Item.GetAt(1))
+	Do Converter.ConvertProductItem(Envelope.Body.MessageParts.MessagePart.Item.GetAt(1),"vhbe")
 	
 	Do $$$AssertEquals(Converter.DoorgestuurdNaarEWMS,$$$False)
 	Do $$$AssertEquals(Converter.NieuwProductGegeven,$$$False)
@@ -122,7 +122,7 @@
 	Set Converter.NieuwProductMock = ProductMock
 	
 	#dim Envelope as AXif.Dynamics.ProductItemIn.Envelope = ..GeefEnvelope("ProductItemInUpdateKorttekst.xml")
-	Do Converter.ConvertProductItem(Envelope.Body.MessageParts.MessagePart.Item.GetAt(1))
+	Do Converter.ConvertProductItem(Envelope.Body.MessageParts.MessagePart.Item.GetAt(1),"vhbe")
 
 	Do $$$AssertEquals(Converter.DoorgestuurdNaarEWMS,$$$True)
 	Do $$$AssertEquals(Converter.NieuwProductGegeven,$$$True)
@@ -172,7 +172,7 @@
 	Do ProductMock.VerwachtMethodCall("ZetTelbaar","").DanDoeNiks()  ;CountableOrDivisible
 	Do ProductMock.VerwachtMethodCall("ZetBarcodeWaarde","09002617767988").DanDoeNiks()  ;GTIN
 	Do ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","ST").DanDoeNiks() ;InventUnitId
-	Do ProductMock.VerwachtMethodCall("ZetLevertermijn",2).DanDoeNiks() ;LeadTimePurch
+	Do ProductMock.VerwachtMethodCall("ZetLevertermijn",1).DanDoeNiks() ;LeadTimePurch
 	Do ProductMock.VerwachtMethodCall("ZetMinimumBestelhoeveelheid",100).DanDoeNiks() ;LowestQtyPurch
 	Do ProductMock.VerwachtMethodCall("ZetGewichtPerDuizendStuksInKG","5.49").DanDoeNiks() ;NetWeight
 	Do ProductMock.VerwachtMethodCall("ZetLeverancierId","L||5005").DanDoeNiks() ;PrimaryVendorId
Index: vhTest/Mock/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r47614 -r47622
--- vhTest/Mock/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47614)
+++ vhTest/Mock/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47622)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="ConvertProductItem">
-<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,LegalEntity:%String="vhbe"</FormalSpec>
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,LegalEntity:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ConvertProductItem",ProductItem,LegalEntity)
 ]]></Implementation>
 </Method>
Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r47614 -r47622
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47614)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47622)
@@ -57,7 +57,7 @@
 </Method>
 
 <Method name="ConvertProductItem">
-<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,LegalEntity:%String="vhbe"</FormalSpec>
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,LegalEntity:%String</FormalSpec>
 <Implementation><![CDATA[
 	Quit:((LegalEntity = "hlx") && (##class(AXimpl.AxToAdminUtils).ConvertSupplierIDHLX(ProductItem.PrimaryVendorId) = "L||6051"))
 	Quit:((LegalEntity = "vhbe") && (##class(AXimpl.AxToAdminUtils).ConvertSupplierID(ProductItem.PrimaryVendorId) = "L||6332"))
@@ -108,7 +108,7 @@
 	Do Product.ZetTelbaar(..BepaalTelbaar(ProductItem)) ;CountableOrDivisible
 	Do Product.ZetBarcodeWaarde(..BepaalBarcodeWaarde(ProductItem)) ;GTIN
 	Do Product.ZetWerkvloerEenheid(..BepaalWerkvloerEenheid(ProductItem)) ;InventUnitId
-	Do Product.ZetLevertermijn(..BepaalLevertermijn(ProductItem)) ;LeadTimePurch
+	Do Product.ZetLevertermijn(..BepaalLevertermijn(ProductItem,LegalEntity)) ;LeadTimePurch
 	Do Product.ZetMinimumBestelhoeveelheid(..BepaalMinimumBestelhoeveelheid(ProductItem)) ;LowestQtyPurch
 	Do Product.ZetGewichtPerDuizendStuksInKG(..BepaalGewichtPerDuizendStuksInKG(ProductItem)) ;NetWeight
 	Do Product.ZetAantalInGrootVerpakking(..BepaalAantalInGrootVerpakking(ProductItem)) ;QtyGVP 
@@ -377,15 +377,17 @@
 </Method>
 
 <Method name="BepaalLevertermijn">
-<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</FormalSpec>
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,LegalEntity:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	;dagen eraf halen die er bij de migratie
-
+	#dim LeverancierNummer as %String = $Piece(..BepaalLeverancierId(ProductItem,LegalEntity),"||",2)
+	#dim StockNietStock = ..BepaalStockNietStock(ProductItem)
+	#dim Extradagen = ##class(AXimpl.AxToAdminUtils).GeefExtraLeveringsDagen(LeverancierNummer,StockNietStock)
  	; werkdagen naar weken afronden naar boven
  
- 	Quit ##class(TECH.Math).Ceil(ProductItem.LeadTimePurch / 5)
+ 	Quit ##class(TECH.Math).Ceil((ProductItem.LeadTimePurch-Extradagen)/ 5)
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/AX/Uitgaand/PM/VrijgegProduct/impl/VoorraadInstellingCalculator.cls.xml
===================================================================
diff -u -r47237 -r47622
--- vhTest/Fake/AX/Uitgaand/PM/VrijgegProduct/impl/VoorraadInstellingCalculator.cls.xml	(.../VoorraadInstellingCalculator.cls.xml)	(revision 47237)
+++ vhTest/Fake/AX/Uitgaand/PM/VrijgegProduct/impl/VoorraadInstellingCalculator.cls.xml	(.../VoorraadInstellingCalculator.cls.xml)	(revision 47622)
@@ -16,8 +16,7 @@
 
 <Method name="AantalVerkocht">
 <FormalSpec>PRNr:%String,KLNr:%String,Begin:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="Afronding">
@@ -28,8 +27,7 @@
 </Method>
 
 <Method name="GGWeekVerkoop">
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GebruiktDoorHalux">
@@ -39,18 +37,15 @@
 </Method>
 
 <Method name="GeefServiceGraad">
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="Gemiddelde">
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="StandaardAfwijking">
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="AfrondingTotBeduidendeCijfers">
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml
===================================================================
diff -u -r47585 -r47622
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml	(.../MappingTest.cls.xml)	(revision 47585)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml	(.../MappingTest.cls.xml)	(revision 47622)
@@ -107,7 +107,7 @@
 
 	Do ..KlasRepositoryMock.VerwachtMethodCall("ZoekViaGroepen","MM","GG","SS").DanReturn(KlasIt)
 	
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")	
 
 	Do ..ProductMock.Verifieer()
 	Do ..KlasRepositoryMock.Verifieer()
@@ -149,7 +149,7 @@
 
 	Set ..Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter).%New(..ProductAPIMock,..ProductRolAPIMock,..LangtekstBewaarderMock,..KlasRepositoryMock,..LoggerMock,..MailAPIMock)
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 	Do ..LoggerMock.Verifieer()
@@ -172,7 +172,7 @@
 	Set ..ProductItem.CertClaimLevel = "NonApplicable"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -182,7 +182,7 @@
 	Set ..ProductItem.CertClaimLevel = "NotCertified"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","GEEN").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -193,7 +193,7 @@
 	Set ..ProductItem.CertClaimLevel = "PEFC70"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","5050").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -204,7 +204,7 @@
 	Set ..ProductItem.CertClaimLevel = "PEFC80"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","8030").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -215,7 +215,7 @@
 	Set ..ProductItem.CertClaimLevel = "FSCControlledWood"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","CW").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -226,7 +226,7 @@
 	Set ..ProductItem.CertClaimLevel = "FSCMix70"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","7030").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -237,7 +237,7 @@
 	Set ..ProductItem.CertClaimLevel = "FSCRecycled100"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","RCLD").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -248,7 +248,7 @@
 	Set ..ProductItem.CertClaimLevel = "FSCMixCredit"
 	Do ..ProductMock.VerwachtMethodCall("ZetFSCHout","MC").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -259,7 +259,7 @@
 	Do ..LoggerMock.VerwachtMethodCall("ErrorMail","Productsynchronizatie AX - Admin","CertClaimLevel 'FSCRecycledCredit' kan niet worden geset voor product IdentNummer")
 	Set ..ProductItem.CertClaimLevel = "FSCRecycledCredit"
 
-	Do ..Converter.ConvertProductItem(..ProductItem)
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 	Do ..LoggerMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -269,7 +269,7 @@
 	Do ..LoggerMock.VerwachtMethodCall("ErrorMail","Productsynchronizatie AX - Admin","CertClaimLevel 'FSC100' kan niet worden geset voor product IdentNummer")
 	Set ..ProductItem.CertClaimLevel = "FSC100"
 
-	Do ..Converter.ConvertProductItem(..ProductItem)
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 	Do ..LoggerMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -279,7 +279,7 @@
 	Do ..LoggerMock.VerwachtMethodCall("ErrorMail","Productsynchronizatie AX - Admin","CertClaimLevel 'OngeldigClaimLevel' kan niet worden geset voor product IdentNummer")
 	Set ..ProductItem.CertClaimLevel = "OngeldigClaimLevel"
 
-	Do ..Converter.ConvertProductItem(..ProductItem)
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 	Do ..LoggerMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -289,7 +289,7 @@
 	Set ..ProductItem.CountableOrDivisible = "Blank"
 	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -300,7 +300,7 @@
 	Set ..ProductItem.CountableOrDivisible = "Zero"
 	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","0").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -311,7 +311,7 @@
 	Set ..ProductItem.CountableOrDivisible = "Half"
 	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","0.5").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -322,7 +322,7 @@
 	Set ..ProductItem.CountableOrDivisible = "One"
 	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","1").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -333,7 +333,7 @@
 	Do ..LoggerMock.VerwachtMethodCall("ErrorMail","Productsynchronizatie AX - Admin","CountableOrDivisible 'OngeldigeWaarde' kan niet worden geset voor product IdentNummer")
 	Set ..ProductItem.CountableOrDivisible = "OngeldigeWaarde"
 
-	Do ..Converter.ConvertProductItem(..ProductItem)
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 	Do ..LoggerMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -343,7 +343,7 @@
 	Set ..ProductItem.NetWeight  = "5.32"
 	Do ..ProductMock.VerwachtMethodCall("ZetGewichtPerDuizendStuksInKG","5.32").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -354,7 +354,7 @@
 	Set ..ProductItem.PrimaryVendorId  = "01001"
 	Do ..ProductMock.VerwachtMethodCall("ZetLeverancierId","L||1001").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -365,7 +365,7 @@
 	Set ..ProductItem.GTIN = "Barcode"
 	Do ..ProductMock.VerwachtMethodCall("ZetBarcodeWaarde","Barcode").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -376,7 +376,7 @@
 	Set ..ProductItem.LeadTimePurch = 4
 	Do ..ProductMock.VerwachtMethodCall("ZetLevertermijn",1).DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -387,7 +387,7 @@
 	Set ..ProductItem.LowestQtyPurch = 50
 	Do ..ProductMock.VerwachtMethodCall("ZetMinimumBestelhoeveelheid",50).DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -398,7 +398,7 @@
 	Set ..ProductItem.InventUnitId = "STK"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","ST").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -409,7 +409,7 @@
 	Set ..ProductItem.InventUnitId = "cm"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","CM").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -420,7 +420,7 @@
 	Set ..ProductItem.InventUnitId = "cm2"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","CM2").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -431,7 +431,7 @@
 	Set ..ProductItem.InventUnitId = "g"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","G").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -442,7 +442,7 @@
 	Set ..ProductItem.InventUnitId = "m"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","M").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -453,7 +453,7 @@
 	Set ..ProductItem.InventUnitId = "cm"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","CM").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -464,7 +464,7 @@
 	Set ..ProductItem.InventUnitId = "mm"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","MM").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -475,7 +475,7 @@
 	Set ..ProductItem.InventUnitId = "mm2"
 	Do ..ProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","MM2").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -486,7 +486,7 @@
 	Do ..LoggerMock.VerwachtMethodCall("ErrorMail","Productsynchronizatie AX - Admin","InventUnidId 'niet toegelaten' kan niet geconverteerd worden voor itemnummer IdentNummer")
 	Set ..ProductItem.InventUnitId = "niet toegelaten"
 
-	Do ..Converter.ConvertProductItem(..ProductItem)
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 	Do ..LoggerMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -496,7 +496,7 @@
 	Set ..ProductItem.CostInsuranceFreight = 3
 	Do ..ProductMock.VerwachtMethodCall("ZetCifPercentage","3").DanDoeNiks()
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -514,7 +514,7 @@
 	Do ..ProductMock.VerwachtMethodCall("ZetAantalInNormaalVerpakking",5).DanDoeNiks() ;QtyNVP 
 	Do ..ProductMock.VerwachtMethodCall("ZetPalletAantal",100).DanDoeNiks() ;QtyPLT	
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -532,7 +532,7 @@
 	Do ..ProductMock.VerwachtMethodCall("ZetAantalInNormaalVerpakking","").DanDoeNiks() ;QtyNVP
 	Do ..ProductMock.VerwachtMethodCall("ZetPalletAantal","").DanDoeNiks() ;QtyPLT	
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -544,7 +544,7 @@
 	
 	Do ..ProductMock.VerwachtMethodCall("ZetCifPPL",34).DanDoeNiks() ;ActiveCostPrice
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -556,7 +556,7 @@
 	
 	Do ..ProductMock.VerwachtMethodCall("ZetStockNietStock",1).DanDoeNiks() ;ReqCovType
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>
@@ -568,7 +568,7 @@
 	
 	Do ..ProductMock.VerwachtMethodCall("ZetStockNietStock","").DanDoeNiks() ;ReqCovType
 
-	Do ..Converter.ConvertProductItem(..ProductItem)	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
 
 	Do ..ProductMock.Verifieer()
 ]]></Implementation>