Index: vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml
===================================================================
diff -u -r45738 -r45740
--- vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 45738)
+++ vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 45740)
@@ -8,10 +8,24 @@
 <Default>1000</Default>
 </Parameter>
 
-<Method name="Test: Het product bestaat niet dus het kan niet geopend worden">
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
+	Do ##super(aTestName)
 	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
-	
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId) 
+	Do ##super(aTestName)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Het product bestaat niet dus het kan niet geopend worden">
+<Implementation><![CDATA[
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Product "_..#ProductId_" bestaat niet!")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
 	
@@ -21,30 +35,34 @@
 
 <Method name="Test: Het product bestaat dus het kan geopend worden">
 <Implementation><![CDATA[
-	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
  	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProduct(..#ProductId)
  	
 	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).OpenId(..#ProductId)
 	
 	Do $$$AssertFalse(Product.IsNieuwProduct())
 	Do $$$AssertEquals(Product.GeefID(),..#ProductId)
 	Do $$$AssertEquals(Product.GeefKorttekst(),"OL.UTPROD1000")
-	
-	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Het product bestaat niet dus het mag gemaakt worden">
 <Implementation><![CDATA[
-	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
-	
 	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId)
 	
 	Do $$$AssertTrue(Product.IsNieuwProduct())
 	Do $$$AssertEquals(Product.GeefID(),"")
 	Do $$$AssertEquals(Product.GeefKorttekst(),"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Het product bestaat dus het mag niet gemaakt worden">
+<Implementation><![CDATA[
+ 	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProduct(..#ProductId)
 	
-	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Product '1000' bestaat reeds!")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+	
+	Do ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId)
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/PM/impl/ProductImpl.cls.xml
===================================================================
diff -u -r45738 -r45740
--- DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 45738)
+++ DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 45740)
@@ -22,10 +22,7 @@
 <ReturnType>DOM.PM.impl.ProductImpl</ReturnType>
 <Implementation><![CDATA[
 	Set Product = ..%New()
-	#dim Status = Product.Open(ProductId)
-	If '(Status = $$$OK){
-		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Product "_ProductId_" bestaat niet!")
-	}
+	Do Product.Open(ProductId)
 	Quit Product
 ]]></Implementation>
 </Method>
@@ -47,9 +44,8 @@
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#dim Status = $$$OK
-	Set Status = ..Product.Open(ProductId)
-	Quit Status
+	Do ..Product.Open(ProductId)
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45738 -r45740
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45738)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45740)
@@ -6,7 +6,7 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="Data">
+<Property name="Data0">
 <Type>%String</Type>
 <Private>1</Private>
 <Parameter name="TRUNCATE" value="1"/>
@@ -50,7 +50,7 @@
 
 <Property name="IsNieuwProduct">
 <Type>%Boolean</Type>
-<InitialExpression>0</InitialExpression>
+<InitialExpression>1</InitialExpression>
 <Private>1</Private>
 </Property>
 
@@ -65,25 +65,30 @@
 </Property>
 
 <Method name="%OnNew">
+<FormalSpec>ProductNummer:%Integer=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..IsNieuwProduct = 1
+	If $length(ProductNummer)&&(($data(^KPR(ProductNummer)))) {
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Product '"_ProductNummer_"' bestaat reeds!")
+	}
+	set ..ProductNummer = ProductNummer
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Open">
 <FormalSpec>ProductNummer:%Integer</FormalSpec>
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#dim Status As %Status = $$$OK
-	Set ..ProductNummer = ProductNummer
-	If ($data(^KPR(..ProductNummer))){
+	If ($data(^KPR(ProductNummer))){
+		Set ..ProductNummer = ProductNummer	
 		Set ..IsNieuwProduct = 0
 	} Else {
-		Set Status = '($$$OK)
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Product "_ProductNummer_" bestaat niet!")
 	}
-	Quit Status
+	Quit
 ]]></Implementation>
 </Method>
 
@@ -92,86 +97,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="DataGet">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	If ( i%Data = "")  {
-		Set i%Data = $$$If($length(..ProductNummer),^KPR(..ProductNummer,0),"")
-	}
-	Quit i%Data
-]]></Implementation>
-</Method>
-
-<Method name="Data1Get">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	If (i%Data1 = "") {
-		Set i%Data1 = $$$If($length(..ProductNummer),^KPR(..ProductNummer,1),"")
-	}
-	Quit i%Data1
-]]></Implementation>
-</Method>
-
-<Method name="Data2Get">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	If ( i%Data2 = "") {
-			Set i%Data2 = $$$If($length(..ProductNummer),^KPR(..ProductNummer,2),"")
-	}
-	Quit i%Data2
-]]></Implementation>
-</Method>
-
-<Method name="Data3Get">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	If (i%Data3 = "") {
-		Set i%Data3 = $$$If($length(..ProductNummer),^KPR(..ProductNummer,3),"")
-	}
-	Quit i%Data3
-]]></Implementation>
-</Method>
-
-<Method name="Data15Get">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	If (i%Data15 = "") {
-		Set i%Data15 = $$$If($length(..ProductNummer),$Get(^KPR(..ProductNummer,15)),"")
-	}
-	Quit i%Data15
-]]></Implementation>
-</Method>
-
-<Method name="DataJGet">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	If (i%DataJ = "") {
-		Set i%DataJ = $$$If($length(..ProductNummer),^KPR(..ProductNummer,$Order(^KPR(..ProductNummer,"J"))),"")
-	}
-	Quit i%DataJ
-]]></Implementation>
-</Method>
-
-<Method name="DataGGet">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	If (i%DataG = "") {
-		Set i%DataG = $$$If($length(..ProductNummer),^KPR(..ProductNummer,"G"),"")
-	}
-	Quit i%DataG
-]]></Implementation>
-</Method>
-
 <Method name="GeefKorttekst">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Data,"\",1)
+<Implementation><![CDATA[	Quit $P(..Data0,"\",1)
 ]]></Implementation>
 </Method>
 
@@ -260,7 +188,7 @@
 
 <Method name="GeefLinkType">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data,"\",23)
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",23)
 ]]></Implementation>
 </Method>
 
@@ -309,31 +237,31 @@
 
 <Method name="GeefOmschrijving">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Data,"\",2) _ " " _ $P(..Data,"\",11)
+<Implementation><![CDATA[	Quit $P(..Data0,"\",2) _ " " _ $P(..Data0,"\",11)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOpeningDatum">
 <ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data,"\",28)
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",28)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefID">
 <ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	Quit ..ProductNummer
+<Implementation><![CDATA[	Quit $$$If(..IsNieuwProduct,"",..ProductNummer)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPRNr">
 <ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	Quit ..ProductNummer
+<Implementation><![CDATA[	Quit $$$If(..IsNieuwProduct,"",..ProductNummer)
 ]]></Implementation>
 </Method>
 
 <Method name="IsStockOverKinderen">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit $piece(^KPR(..ProductNummer,0),"\",23)="S"
+<Implementation><![CDATA[	quit $piece(..Data0,"\",23)="S"
 ]]></Implementation>
 </Method>
 
@@ -387,7 +315,7 @@
 
 <Method name="GeefScanType">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit $Piece(..Data,"\",24)
+<Implementation><![CDATA[	quit $Piece(..Data0,"\",24)
 ]]></Implementation>
 </Method>
 
@@ -448,7 +376,7 @@
 <Method name="GeefStockDrempelVoorAankoop">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
-	#Dim Aantal As %Float = $Piece(..Data, "\", 24)
+	#Dim Aantal As %Float = $Piece(..Data0, "\", 24)
 	If ('$ISVALIDNUM(Aantal)) Set Aantal = ""
 	
 	Quit Aantal
@@ -457,7 +385,7 @@
 
 <Method name="GeefGenerischProductID">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data,"\",3)
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",3)
 ]]></Implementation>
 </Method>
 
@@ -497,13 +425,13 @@
 
 <Method name="IsInUitverkoop">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ($Piece(..Data,"\",6) '= "") && ($Piece(..Data,"\",6)<=##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
+<Implementation><![CDATA[	Quit ($Piece(..Data0,"\",6) '= "") && ($Piece(..Data0,"\",6)<=##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
 ]]></Implementation>
 </Method>
 
 <Method name="GeefUitverkoopSinds">
 <ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data,"\",6)
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",6)
 ]]></Implementation>
 </Method>
 
@@ -537,13 +465,13 @@
 
 <Method name="GeefBTWCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data,"\",5)
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",5)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBoekhoudkundigeRekening">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data,"\",10)
+<Implementation><![CDATA[	Quit $Piece(..Data0,"\",10)
 ]]></Implementation>
 </Method>
 
@@ -596,6 +524,83 @@
 <Implementation><![CDATA[	Quit $$GETROUND^PRODUKT2(..ProductNummer)
 ]]></Implementation>
 </Method>
+
+<Method name="Data0Get">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If ( i%Data0 = "")  {
+		Set i%Data0 = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,0),"")
+	}
+	Quit i%Data0
+]]></Implementation>
+</Method>
+
+<Method name="Data1Get">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (i%Data1 = "") {
+		Set i%Data1 = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,1),"")
+	}
+	Quit i%Data1
+]]></Implementation>
+</Method>
+
+<Method name="Data2Get">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If ( i%Data2 = "") {
+			Set i%Data2 = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,2),"")
+	}
+	Quit i%Data2
+]]></Implementation>
+</Method>
+
+<Method name="Data3Get">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (i%Data3 = "") {
+		Set i%Data3 = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,3),"")
+	}
+	Quit i%Data3
+]]></Implementation>
+</Method>
+
+<Method name="Data15Get">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (i%Data15 = "") {
+		Set i%Data15 = $$$If($$$Not(..IsNieuwProduct),$Get(^KPR(..ProductNummer,15)),"")
+	}
+	Quit i%Data15
+]]></Implementation>
+</Method>
+
+<Method name="DataJGet">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (i%DataJ = "") {
+		Set i%DataJ = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,$Order(^KPR(..ProductNummer,"J"))),"")
+	}
+	Quit i%DataJ
+]]></Implementation>
+</Method>
+
+<Method name="DataGGet">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (i%DataG = "") {
+		Set i%DataG = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,"G"),"")
+	}
+	Quit i%DataG
+]]></Implementation>
+</Method>
 </Class>