Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r46573 -r46578
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 46573)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 46578)
@@ -61,7 +61,7 @@
 	;Do Product.ZetWeetNiet2(..BepaalWeetNiet2(ProductItem)) ;BOMUnitId
 	Do Product.ZetFSCHout(..BepaalFSCHout(ProductItem)) ;CertClaimLevel
 	;Do Product.ZetCifPercentage(..BepaalCifPercentage(ProductItem)) ;CostInsuranceFreight, niet in bestand
-	;Do Product.ZetTelbaar(..BepaalTelbaar(ProductItem)) ;CountableOrDivisible
+	Do Product.ZetTelbaar(..BepaalTelbaar(ProductItem)) ;CountableOrDivisible
 	;Do Product.ZetBarcodeWaarde(..BepaalBarcodeWaarde(ProductItem)) ;GTIN, niet in bestand
 	;Do Product.ZetWeetNiet3(..BepaalWeetNiet3(ProductItem)) ;InventUnitId
 	;Do Product.ZetIdentNr(..BepaalIdentNr(ProductItem)) ;alleen bij nieuw product? aangezien we product vinden via identnummer....
@@ -198,8 +198,7 @@
 		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
 
 	}
-
- Quit FSCHout
+ 	Quit FSCHout
 ]]></Implementation>
 </Method>
 
@@ -215,7 +214,21 @@
 <FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[ Quit ProductItem.CountableOrDivisible
+<Implementation><![CDATA[
+	#Dim Telbaar as %String = ""
+	If ProductItem.CountableOrDivisible = "Blank" {
+		Set Telbaar = ""
+	}elseif ProductItem.CountableOrDivisible = "Zero" {
+		Set Telbaar = "0"
+	}elseif ProductItem.CountableOrDivisible = "Half" {
+		Set Telbaar = "0.5"
+	}elseif ProductItem.CountableOrDivisible = "One" {
+		Set Telbaar = "1"
+	} else {
+		Set Exceptie = ##class(TECH.Exceptions.IllegalArgumentException).%New("CountableOrDivisible '" _ProductItem.CountableOrDivisible _"' kan niet worden geset voor product "_ProductItem.ItemId)
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)		
+	}
+	Quit Telbaar
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml
===================================================================
diff -u -r46573 -r46578
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 46573)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 46578)
@@ -50,7 +50,7 @@
 	;Do ProductMock.VerwachtMethodCall("ZetWeetNiet2","").DanDoeNiks() ;BOMUnitId
 	Do ProductMock.VerwachtMethodCall("ZetFSCHout","").DanDoeNiks() ;CertClaimLevel
 	;Do ProductMock.VerwachtMethodCall("ZetCifPercentage","").DanDoeNiks() ;CostInsuranceFreight, niet in bestand
-	;Do ProductMock.VerwachtMethodCall("ZetTelbaar","").DanDoeNiks()  ;CountableOrDivisible
+	Do ProductMock.VerwachtMethodCall("ZetTelbaar","").DanDoeNiks()  ;CountableOrDivisible
 	;Do ProductMock.VerwachtMethodCall("ZetBarcodeWaarde","").DanDoeNiks()  ;GTIN, niet in bestand
 	;Do ProductMock.VerwachtMethodCall("ZetWeetNiet3","").DanDoeNiks() ;InventUnitId
 	;Do ProductMock.VerwachtMethodCall("ZetIdentNr","").DanDoeNiks() ;ItemId
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml
===================================================================
diff -u -r46573 -r46578
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml	(.../MappingTest.cls.xml)	(revision 46573)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml	(.../MappingTest.cls.xml)	(revision 46578)
@@ -187,6 +187,61 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test Zet Telbaar op lege string indien CountableOrDivisible Blank bevat">
+<Implementation><![CDATA[
+	Set ..ProductItem.CountableOrDivisible = "Blank"
+	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","").DanDoeNiks()
+
+	Do ..Converter.Convert(..Envelope)	
+
+	Do ..ProductMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Zet Telbaar op 0 indien CountableOrDivisible Zero bevat">
+<Implementation><![CDATA[
+	Set ..ProductItem.CountableOrDivisible = "Zero"
+	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","0").DanDoeNiks()
+
+	Do ..Converter.Convert(..Envelope)	
+
+	Do ..ProductMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Zet Telbaar op 0punt5 indien CountableOrDivisible Half bevat">
+<Implementation><![CDATA[
+	Set ..ProductItem.CountableOrDivisible = "Half"
+	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","0.5").DanDoeNiks()
+
+	Do ..Converter.Convert(..Envelope)	
+
+	Do ..ProductMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Zet Telbaar op 1 indien CountableOrDivisible One bevat">
+<Implementation><![CDATA[
+	Set ..ProductItem.CountableOrDivisible = "One"
+	Do ..ProductMock.VerwachtMethodCall("ZetTelbaar","1").DanDoeNiks()
+
+	Do ..Converter.Convert(..Envelope)	
+
+	Do ..ProductMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Exceptie indien indien CountableOrDivisible ongeldige waarde bevat bevat">
+<Implementation><![CDATA[
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("CountableOrDivisible 'OngeldigeWaarde' kan niet worden geset voor product IdentNummer")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.IllegalArgumentException).%ClassName(1),Substrings))
+
+	Set ..ProductItem.CountableOrDivisible = "OngeldigeWaarde"
+
+	Do ..Converter.Convert(..Envelope)
+]]></Implementation>
+</Method>
+
 <Method name="MaakEnvelopeMetProductItem">
 <FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</FormalSpec>
 <Private>1</Private>
@@ -203,6 +258,8 @@
 	Set ProductItem = ##class(AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem).%New()	
 	
 	Set ProductItem.ItemId = "IdentNummer"
+	Set ProductItem.CountableOrDivisible= "Blank"
+	Set ProductItem.CertClaimLevel = "NonApplicable"
 	Set Translation = ##class(AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityTranslation).%New()
 	Set Translation.Description = "Omschrijving"
 	Set Translation.LanguageId = "nl-be"
@@ -227,7 +284,7 @@
 	Do ProductMock.IndienMethodCall("ZetFSCHout","").DanDoeNiks()
 	;Do ProductMock.IndienMethodCall("ZetFSCHout",$$$ElkeWaarde).DanDoeNiks()
 	;Do ProductMock.IndienMethodCall("ZetCifPercentage",$$$ElkeWaarde).DanDoeNiks()
-	;Do ProductMock.IndienMethodCall("ZetTelbaar",$$$ElkeWaarde).DanDoeNiks()
+	Do ProductMock.IndienMethodCall("ZetTelbaar","").DanDoeNiks()
 	;Do ProductMock.IndienMethodCall("ZetBarcodeWaarde",$$$ElkeWaarde).DanDoeNiks()
 	;Do ProductMock.IndienMethodCall("ZetWeetNiet3",$$$ElkeWaarde).DanDoeNiks()
 	;Do ProductMock.IndienMethodCall("ZetIdentNr",$$$ElkeWaarde).DanDoeNiks()