Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r46980 -r46998
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46980)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46998)
@@ -639,6 +639,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefWerkvloerEenheid">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Data15.GeefPiece(9)
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[	Do ..Data2.ZetPiece(25, IdentNr)
@@ -763,6 +769,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetWerkvloerEenheid">
+<FormalSpec>WerkvloerEenheid:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..Data15.ZetPiece(9,WerkvloerEenheid)
+]]></Implementation>
+</Method>
+
 <Method name="Data0Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
Index: vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r46980 -r46998
--- vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46980)
+++ vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46998)
@@ -14,6 +14,18 @@
 <Type>%Integer</Type>
 </Property>
 
+<Method name="GeefWerkvloerEenheid">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="ZetWerkvloerEenheid">
+<FormalSpec>WerkvloerEenheid:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="GeefLevertermijn">
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[	Quit ""
@@ -22,6 +34,7 @@
 
 <Method name="ZetLevertermijn">
 <FormalSpec>AantalWeken:%Integer</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefAantalInNormaalVerpakking">
Index: vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml
===================================================================
diff -u -r46980 -r46998
--- vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 46980)
+++ vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 46998)
@@ -639,6 +639,32 @@
 	Do DataMProductMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: ZetWerklvloerEenheid zet de werkvloereenheid">
+<Implementation><![CDATA[
+	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
+	
+	Do DataMProductMock.VerwachtMethodCall("ZetWerkvloerEenheid","MM").DanDoeNiks()
+	
+	Do Product.ZetWerkvloerEenheid("MM")
+	
+	Do DataMProductMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: ZetWerklvloerEenheid geeft de werkvloereenheid">
+<Implementation><![CDATA[
+	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
+	
+	Do DataMProductMock.VerwachtMethodCall("GeefWerkvloerEenheid").DanReturn("MM")
+	
+	Do $$$AssertEquals(Product.GeefWerkvloerEenheid(),"MM")
+	
+	Do DataMProductMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/PM/impl/ProductImpl.cls.xml
===================================================================
diff -u -r46980 -r46998
--- DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 46980)
+++ DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 46998)
@@ -590,6 +590,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefWerkvloerEenheid">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Product.GeefWerkvloerEenheid()
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[	Do ..Product.ZetIdentNr(IdentNr)
@@ -710,6 +716,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetWerkvloerEenheid">
+<FormalSpec>WerkvloerEenheid:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..Product.ZetWerkvloerEenheid(WerkvloerEenheid)
+]]></Implementation>
+</Method>
+
 <Method name="ZetUitverkoopSinds">
 <FormalSpec>UitverkoopSinds:%Date</FormalSpec>
 <Implementation><![CDATA[	Do ..Product.ZetUitverkoopSinds(UitverkoopSinds)
Index: vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r46980 -r46998
--- vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46980)
+++ vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46998)
@@ -225,12 +225,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLevertermijn">
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLevertermijn")
-]]></Implementation>
-</Method>
-
 <Method name="GeefLeverancierID">
 <ReturnType>DOM.common.PartijID</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLeverancierID")
@@ -243,6 +237,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLevertermijn">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLevertermijn")
+]]></Implementation>
+</Method>
+
 <Method name="GeefLijstVerkoopPrijs">
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLijstVerkoopPrijs")
@@ -364,6 +364,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefWerkvloerEenheid">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefWerkvloerEenheid")
+]]></Implementation>
+</Method>
+
 <Method name="IsInUitverkoop">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("IsInUitverkoop")
@@ -466,12 +472,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetLevertermijn">
-<FormalSpec>AantalWeken:%Integer</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLevertermijn",AantalWeken)
-]]></Implementation>
-</Method>
-
 <Method name="ZetLeverancierId">
 <FormalSpec>LeverancierId:DOM.common.PartijID</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverancierId",LeverancierId)
@@ -484,6 +484,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetLevertermijn">
+<FormalSpec>AantalWeken:%Integer</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLevertermijn",AantalWeken)
+]]></Implementation>
+</Method>
+
 <Method name="ZetMinimumBestelhoeveelheid">
 <FormalSpec>MinimumBestelhoeveelheid:%Integer</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetMinimumBestelhoeveelheid",MinimumBestelhoeveelheid)
@@ -519,6 +525,12 @@
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetUitverkoopSinds",UitverkoopSinds)
 ]]></Implementation>
 </Method>
+
+<Method name="ZetWerkvloerEenheid">
+<FormalSpec>WerkvloerEenheid:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetWerkvloerEenheid",WerkvloerEenheid)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/DOM/PM/Product.cls.xml
===================================================================
diff -u -r46980 -r46998
--- vhTest/Mock/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 46980)
+++ vhTest/Mock/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 46998)
@@ -237,12 +237,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLevertermijn">
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLevertermijn")
-]]></Implementation>
-</Method>
-
 <Method name="GeefLeverancierID">
 <ReturnType>DOM.common.PartijID</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLeverancierID")
@@ -255,6 +249,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLevertermijn">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLevertermijn")
+]]></Implementation>
+</Method>
+
 <Method name="GeefLijstVerkoopPrijs">
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLijstVerkoopPrijs")
@@ -394,6 +394,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefWerkvloerEenheid">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefWerkvloerEenheid")
+]]></Implementation>
+</Method>
+
 <Method name="HeeftHoutCertificaat">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("HeeftHoutCertificaat")
@@ -520,12 +526,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetLevertermijn">
-<FormalSpec>AantalWeken:%Integer</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLevertermijn",AantalWeken)
-]]></Implementation>
-</Method>
-
 <Method name="ZetLeverancierId">
 <FormalSpec>LeverancierId:%Integer</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverancierId",LeverancierId)
@@ -538,6 +538,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetLevertermijn">
+<FormalSpec>AantalWeken:%Integer</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLevertermijn",AantalWeken)
+]]></Implementation>
+</Method>
+
 <Method name="ZetMinimumBestelhoeveelheid">
 <FormalSpec>MinimumBestelhoeveelheid:%Integer</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetMinimumBestelhoeveelheid",MinimumBestelhoeveelheid)
@@ -573,6 +579,12 @@
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetUitverkoopSinds",UitverkoopSinds)
 ]]></Implementation>
 </Method>
+
+<Method name="ZetWerkvloerEenheid">
+<FormalSpec>WerkvloerEenheid:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetWerkvloerEenheid",WerkvloerEenheid)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/PM/Product.cls.xml
===================================================================
diff -u -r46980 -r46998
--- DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 46980)
+++ DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 46998)
@@ -371,6 +371,11 @@
 <ReturnType>%Integer</ReturnType>
 </Method>
 
+<Method name="GeefWerkvloerEenheid">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="IsFysiekHetzelfdeProductAls">
 <Abstract>1</Abstract>
 <FormalSpec>AnderProductID:%String</FormalSpec>
@@ -482,6 +487,11 @@
 <FormalSpec>AantalWeken:%Integer</FormalSpec>
 </Method>
 
+<Method name="ZetWerkvloerEenheid">
+<Abstract>1</Abstract>
+<FormalSpec>WerkvloerEenheid:%String</FormalSpec>
+</Method>
+
 <Method name="Save">
 <Abstract>1</Abstract>
 </Method>