Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r802 -r903
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 802)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 903)
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-07 11:35:14">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-03 13:49:48">
 <Class name="DOM.PM.impl.DataM.DataMProduct">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>DOM.PM.Product,%RegisteredObject</Super>
-<TimeChanged>62129,41762.675744</TimeChanged>
+<Super>%RegisteredObject</Super>
+<TimeChanged>62153,49856.656689</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Data">
 <Type>%String</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="Data2">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="ProductNummer">
 <Type>%Integer</Type>
 <Private>1</Private>
@@ -25,6 +30,28 @@
 ]]></Implementation>
 </Method>
 
+<Method name="DataGet">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (i%Data = "") {
+		Set i%Data = ^KPR(..ProductNummer,0)
+	}
+	Quit i%Data
+]]></Implementation>
+</Method>
+
+<Method name="Data2Get">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (i%Data2 = "") {
+		Set i%Data2 = ^KPR(..ProductNummer,2)
+	}
+	Quit i%Data2
+]]></Implementation>
+</Method>
+
 <Method name="GeefKorttekst">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit $P(..Data,"\",1)
@@ -43,31 +70,60 @@
 	for { set idx = $order(Array(idx)) quit:idx="" 
 		set Langtekst = Langtekst_Array(idx)_" "
 	}
+
 	set Langtekst = $extract(Langtekst,1,$length(Langtekst)-1)
 	quit Langtekst
 ]]></Implementation>
 </Method>
 
 <Method name="GeefDossierNr">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(^KPR(..ProductNummer,"G"),"\")
+<Implementation><![CDATA[	Quit $P(^KPR(..ProductNummer,"G"),"\",1)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKostBouwstenenIterator">
 <ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..GeefKostBouwsteenLijst("BS"))
+]]></Implementation>
+</Method>
+
+<Method name="GeefKostSchaduwBouwstenenIt">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..GeefKostBouwsteenLijst("BSS"))
+]]></Implementation>
+</Method>
+
+<Method name="GeefSchaduwVersie">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Piece($Get(^PRBS("BSS",..ProductNummer)),"\",3)
+]]></Implementation>
+</Method>
+
+<Method name="GeefIdentNr">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Piece(..Data2,"\",25)
+]]></Implementation>
+</Method>
+
+<Method name="GeefKostBouwsteenLijst">
+<Description>
+Type is BS of BSS</Description>
+<FormalSpec>Type:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	Set BouwsteenLijst = ##class(%ListOfObjects).%New()
 	
-	Set Key = $Order(^PRBS("BS",..ProductNummer,"KST."))
+	Set Key = $Order(^PRBS(Type,..ProductNummer,"KST."))
 	While ((Key '= "") && (Key [ "KST."))
 	{
 		Set Bouwsteen = ##class(DOM.PR.BouwStenen.BouwSteen).%OpenId(..ProductNummer_"||"_Key)
 		Do BouwsteenLijst.Insert(Bouwsteen)
-		Set Key = $Order(^PRBS("BS",..ProductNummer,Key))
+		Set Key = $Order(^PRBS(Type,..ProductNummer,Key))
 	}
 	
-	Quit ##class(TECH.ListIterator).%New(BouwsteenLijst)
+	Quit BouwsteenLijst
 ]]></Implementation>
 </Method>
 
@@ -86,6 +142,14 @@
 	{
 		Set BerekeningsSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%OpenId(ID)
 	}
+	
+	/// Standaard specificatie invullen, dit enkel omdat oude producten nog geen berekeningsspecificatie conversie hebben
+	If (BerekeningsSpecificatie = "")
+	{
+		Set KlantID = 1000
+		Set Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
+		Set BerekeningsSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%New(1,KlantID,Personality)
+	}
 	Quit BerekeningsSpecificatie
 ]]></Implementation>
 </Method>
@@ -118,17 +182,6 @@
 	Quit IsLanggoed
 ]]></Implementation>
 </Method>
-
-<Method name="DataGet">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	If (i%Data = "") {
-		Set i%Data = ^KPR(..ProductNummer,0)
-	}
-	Quit i%Data
-]]></Implementation>
-</Method>
 </Class>
-<Checksum value="4291367209"/>
+<Checksum value="3573935308"/>
 </Export>