Index: DOM/VKP/dto/VerkoopPrijsUitzondering.cls.xml
===================================================================
diff -u -r45344 -r45358
--- DOM/VKP/dto/VerkoopPrijsUitzondering.cls.xml	(.../VerkoopPrijsUitzondering.cls.xml)	(revision 45344)
+++ DOM/VKP/dto/VerkoopPrijsUitzondering.cls.xml	(.../VerkoopPrijsUitzondering.cls.xml)	(revision 45358)
@@ -43,14 +43,18 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="ProductId">
+<Property name="PRNr">
 <Type>%String</Type>
 </Property>
 
 <Property name="SubGroep">
 <Type>%String</Type>
 </Property>
 
+<Property name="VolgNr">
+<Type>%String</Type>
+</Property>
+
 <Method name="FromNode">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Subscript:%String</FormalSpec>
@@ -62,12 +66,33 @@
 	}
 	
 	Set VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
+	Set VerkoopPrijsUitzondering.Groep = $Extract($Piece(Subscript,",",4),2,*-2)
 	Set VerkoopPrijsUitzondering.HoofdGroep = $Extract($Piece(Subscript,",",3),2,*-2)
 	Set VerkoopPrijsUitzondering.KlantId = "K||"_$Piece(Subscript,",",2)
 	
 	Quit VerkoopPrijsUitzondering
 ]]></Implementation>
 </Method>
+
+<Method name="ToDataString">
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="ToSubscript">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Subscript As %String
+	Set $Piece(Subscript,",",1) = """N"""
+	Set $Piece(Subscript,",",2) = $Piece(..KlantId,"||",2)
+	Set $Piece(Subscript,",",3) = $$$If(..HoofdGroep = "","""0""", """"_..HoofdGroep_" """)
+	Set $Piece(Subscript,",",4) = $$$If(..Groep = "","""0""", """"_..Groep_" """)
+	Set $Piece(Subscript,",",5) = $$$If(..SubGroep = "","""0""", """"_..SubGroep_" """)
+	Set $Piece(Subscript,",",6) = $$$If(..PRNr = "","""0""", """"_..PRNr_"""")
+	Set $Piece(Subscript,",",7) = $$$If(..VolgNr = "", 0, ..VolgNr)
+	
+	Quit Subscript
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml
===================================================================
diff -u -r45346 -r45358
--- vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml	(.../Test.cls.xml)	(revision 45346)
+++ vhUnitTest/DOM/VKP/dto/VerkoopPrijsUitzondering/Test.cls.xml	(.../Test.cls.xml)	(revision 45358)
@@ -13,25 +13,6 @@
 <Private>1</Private>
 </Property>
 
-<Method name="OnBeforeAllTests">
-<Implementation><![CDATA[
- 	Do ##super()
- 	Set VerkoopPrijzUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
-	Set VerkoopPrijzUitzondering.KlantId = "K||999"
-	Set VerkoopPrijzUitzondering.HoofdGroep = "01CH"
-	
-	#dim Subscript As %String
-	Set $Piece(Subscript,",",1) = """N"""
-	Set $Piece(Subscript,",",2) = $Piece(VerkoopPrijzUitzondering.KlantId,"||",2)
-	Set $Piece(Subscript,",",3) = """"_VerkoopPrijzUitzondering.HoofdGroep_" """
-	Set $Piece(Subscript,",",4) = """0"""
-	Set $Piece(Subscript,",",5) = """0"""
-	Set $Piece(Subscript,",",6) = """0"""
-	Set $Piece(Subscript,",",7) = """0"""
-	Set ..OpgezetteSubscript = Subscript
-]]></Implementation>
-</Method>
-
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -50,6 +31,10 @@
 
 <Method name="Test: De node bestaat niet">
 <Implementation><![CDATA[
+	Set ..VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
+	Set ..VerkoopPrijsUitzondering.KlantId = "K||999"
+	Set ..OpgezetteSubscript = ..VerkoopPrijsUitzondering.ToSubscript()
+	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Subscript '"_..OpgezetteSubscript_"' bestaat niet.")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(..E.InvalidInputException,Substrings))
 	
@@ -59,6 +44,10 @@
 
 <Method name="Test: De 2e node zet het klantnummer">
 <Implementation><![CDATA[
+	Set ..VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
+	Set ..VerkoopPrijsUitzondering.KlantId = "K||999"
+	Set ..OpgezetteSubscript = ..VerkoopPrijsUitzondering.ToSubscript()
+	
 	Set @("^KLPUTZ("_..OpgezetteSubscript_")") = "20\0\\178177\\\64649\64663\64531;THB\\\\\\\"
 	
 	#dim VerkoopPrijsUitzondering As DOM.VKP.dto.VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).FromNode(..OpgezetteSubscript)
@@ -69,6 +58,11 @@
 
 <Method name="Test: De 3e node zet de hoofdgroep">
 <Implementation><![CDATA[
+	Set ..VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
+	Set ..VerkoopPrijsUitzondering.KlantId = "K||999"
+	Set ..VerkoopPrijsUitzondering.HoofdGroep = "01CH"
+	Set ..OpgezetteSubscript = ..VerkoopPrijsUitzondering.ToSubscript()
+	
 	Set @("^KLPUTZ("_..OpgezetteSubscript_")") = "20\0\\178177\\\64649\64663\64531;THB\\\\\\\"
 	
 	#dim VerkoopPrijsUitzondering As DOM.VKP.dto.VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).FromNode(..OpgezetteSubscript)
@@ -77,6 +71,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: De 4e node zet de groep">
+<Implementation><![CDATA[
+	Set ..VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).%New()
+	Set ..VerkoopPrijsUitzondering.KlantId = "K||999"
+	Set ..VerkoopPrijsUitzondering.Groep = "01CH02NOR"
+	Set ..OpgezetteSubscript = ..VerkoopPrijsUitzondering.ToSubscript()
+	
+	Set @("^KLPUTZ("_..OpgezetteSubscript_")") = "20\0\\178177\\\64649\64663\64531;THB\\\\\\\"
+	
+	#dim VerkoopPrijsUitzondering As DOM.VKP.dto.VerkoopPrijsUitzondering = ##class(DOM.VKP.dto.VerkoopPrijsUitzondering).FromNode(..OpgezetteSubscript)
+	
+	Do $$$AssertEquals(VerkoopPrijsUitzondering.Groep,"01CH02NOR")
+]]></Implementation>
+</Method>
+
 <Method name="KuisDataOp">
 <Private>1</Private>
 <Implementation><![CDATA[