Index: vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml
===================================================================
diff -u -r46214 -r46980
--- vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 46214)
+++ vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 46980)
@@ -613,6 +613,32 @@
 	Do DataMProductMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: ZetLevertermijn zet de levertermijn">
+<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("ZetLevertermijn",2).DanDoeNiks()
+	
+	Do Product.ZetLevertermijn(2)
+	
+	Do DataMProductMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefLevertermijn geeft de levertermijn">
+<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("GeefLevertermijn").DanReturn("2")
+	
+	Do $$$AssertEquals(Product.GeefLevertermijn(),"2")
+	
+	Do DataMProductMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/DOM/PM/Product.cls.xml
===================================================================
diff -u -r46214 -r46980
--- vhTest/Mock/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 46214)
+++ vhTest/Mock/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 46980)
@@ -237,6 +237,12 @@
 ]]></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")
@@ -514,6 +520,12 @@
 ]]></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)
Index: vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r46214 -r46980
--- vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46214)
+++ vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46980)
@@ -14,6 +14,16 @@
 <Type>%Integer</Type>
 </Property>
 
+<Method name="GeefLevertermijn">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="ZetLevertermijn">
+<FormalSpec>AantalWeken:%Integer</FormalSpec>
+</Method>
+
 <Method name="GeefAantalInNormaalVerpakking">
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[	Quit ""
Index: DOM/PM/Product.cls.xml
===================================================================
diff -u -r46214 -r46980
--- DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 46214)
+++ DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 46980)
@@ -366,6 +366,11 @@
 <ReturnType>%Integer</ReturnType>
 </Method>
 
+<Method name="GeefLevertermijn">
+<Abstract>1</Abstract>
+<ReturnType>%Integer</ReturnType>
+</Method>
+
 <Method name="IsFysiekHetzelfdeProductAls">
 <Abstract>1</Abstract>
 <FormalSpec>AnderProductID:%String</FormalSpec>
@@ -472,6 +477,11 @@
 <FormalSpec>UitverkoopSinds:%Date</FormalSpec>
 </Method>
 
+<Method name="ZetLevertermijn">
+<Abstract>1</Abstract>
+<FormalSpec>AantalWeken:%Integer</FormalSpec>
+</Method>
+
 <Method name="Save">
 <Abstract>1</Abstract>
 </Method>
Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r46214 -r46980
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46214)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46980)
@@ -633,6 +633,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLevertermijn">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit ..DataJ.GeefPiece(7)
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[	Do ..Data2.ZetPiece(25, IdentNr)
@@ -751,6 +757,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetLevertermijn">
+<FormalSpec>AantalWeken:%Integer</FormalSpec>
+<Implementation><![CDATA[	Do ..DataJ.ZetPiece(7,AantalWeken)
+]]></Implementation>
+</Method>
+
 <Method name="Data0Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
Index: DOM/PM/impl/ProductImpl.cls.xml
===================================================================
diff -u -r46214 -r46980
--- DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 46214)
+++ DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 46980)
@@ -584,6 +584,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLevertermijn">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit ..Product.GeefLevertermijn()
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[	Do ..Product.ZetIdentNr(IdentNr)
@@ -698,6 +704,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetLevertermijn">
+<FormalSpec>AantalWeken:%Integer</FormalSpec>
+<Implementation><![CDATA[	Do ..Product.ZetLevertermijn(AantalWeken)
+]]></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 -r46214 -r46980
--- vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46214)
+++ vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46980)
@@ -225,6 +225,12 @@
 ]]></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")
@@ -460,6 +466,12 @@
 ]]></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)