Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45740 -r45743
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45740)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45743)
@@ -71,18 +71,21 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	If $length(ProductNummer)&&(($data(^KPR(ProductNummer)))) {
-		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Product '"_ProductNummer_"' bestaat reeds!")
-	}
-	set ..ProductNummer = ProductNummer
+	If $Length(ProductNummer) {
+		If (($Data(^KPR(ProductNummer)))) {
+			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Product '"_ProductNummer_"' bestaat reeds!")
+		} ElseIf (($Data(^KPRO(ProductNummer)))) {
+			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Product '"_ProductNummer_"' heeft al ooit bestaan en mag niet opnieuw gemaakt worden!")
+	}}
+	Set ..ProductNummer = ProductNummer
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Open">
 <FormalSpec>ProductNummer:%Integer</FormalSpec>
 <Implementation><![CDATA[
-	If ($data(^KPR(ProductNummer))){
+	If ($Data(^KPR(ProductNummer))){
 		Set ..ProductNummer = ProductNummer	
 		Set ..IsNieuwProduct = 0
 	} Else {
@@ -93,7 +96,7 @@
 </Method>
 
 <Method name="IsNieuwProduct">
-<Implementation><![CDATA[	quit ..IsNieuwProduct
+<Implementation><![CDATA[	Quit ..IsNieuwProduct
 ]]></Implementation>
 </Method>
 
@@ -122,16 +125,16 @@
 	Do ..GeefProductTekst().GetOmschrijvingArray(Taal,.Array)
 	
 	#dim Delim As %String = $$$CRLF
-	if RemoveCRLF set Delim = " "
+	If RemoveCRLF Set Delim = " "
 	
-	set idx = ""
-	set Langtekst = ""
-	for { set idx = $order(Array(idx)) quit:idx="" 
-		set Langtekst = Langtekst_Array(idx)_Delim
+	Set idx = ""
+	Set Langtekst = ""
+	For { Set idx = $Order(Array(idx)) Quit:idx="" 
+		Set Langtekst = Langtekst_Array(idx)_Delim
 	}
 
-	set Langtekst = $extract(Langtekst,1,$length(Langtekst)-$length(Delim))
-	quit Langtekst
+	Set Langtekst = $Extract(Langtekst,1,$Length(Langtekst)-$Length(Delim))
+	Quit Langtekst
 ]]></Implementation>
 </Method>
 
@@ -174,6 +177,7 @@
 <Method name="GeefSchaduwVersie">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	#dim SchaduwVersie As %String
 	Set SchaduwVersie = $Piece($Get(^PRBS("BSS",..ProductNummer)),"\",3)
 	If ($Extract(SchaduwVersie,1,1) = "v") { Set $Extract(SchaduwVersie,1,1) = "" }
 	Quit SchaduwVersie
@@ -194,7 +198,7 @@
 
 <Method name="GeefTelbaar">
 <ReturnType>TECH.String</ReturnType>
-<Implementation><![CDATA[	quit $Piece(..Data1, "\", 7)
+<Implementation><![CDATA[	Quit $Piece(..Data1, "\", 7)
 ]]></Implementation>
 </Method>
 
@@ -203,6 +207,7 @@
 <Private>1</Private>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
+	#dim Node,Key,Bouwsteen As %String
 	Set BouwsteenLijst = ##class(%ListOfObjects).%New()
 	If ('IsSchaduw)
 	{
@@ -261,7 +266,7 @@
 
 <Method name="IsStockOverKinderen">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit $piece(..Data0,"\",23)="S"
+<Implementation><![CDATA[	Quit $piece(..Data0,"\",23)="S"
 ]]></Implementation>
 </Method>