Index: DOM/PM/impl/DataM/DataMBouwsteenCreator.cls.xml
===================================================================
diff -u -r65818 -r65983
--- DOM/PM/impl/DataM/DataMBouwsteenCreator.cls.xml	(.../DataMBouwsteenCreator.cls.xml)	(revision 65818)
+++ DOM/PM/impl/DataM/DataMBouwsteenCreator.cls.xml	(.../DataMBouwsteenCreator.cls.xml)	(revision 65983)
@@ -57,8 +57,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="IsSchaduwBerekening">
-<Type>%Boolean</Type>
+<Property name="BSNode">
+<Type>%String</Type>
 <Private>1</Private>
 </Property>
 
@@ -90,12 +90,17 @@
 	Set ..BerekeningsSpecificatie = BerekeningsSpecificatie
 	Set ..HalffabItemsBoom = HalffabItemsBoom
 	Set ..KostItem = KostItem
-	Set ..IsSchaduwBerekening = IsSchaduwBerekening
 	
+	If (IsSchaduwBerekening) {
+		Set ..BSNode = "BSS"
+	} Else {
+		Set ..BSNode = "BS"
+	}
+	
 	// Omdat DELOBJ het linktype reset gaan we dit lokaal bewaren
 	#dim LinkType As %String = $P(^KPR(PRNr,0),"\",23)
 	// Verwijderen van reeds bestaande bouwstenen
-	If $$$Not(..IsSchaduwBerekening) {
+	If $$$Not(IsSchaduwBerekening) {
 		Do DELOBJ^PRBS(PRNr)
 	}
 	
@@ -124,11 +129,7 @@
 <Implementation><![CDATA[
 	If (..ProductSpecificatie.GeefFamilie() = ##class(DOM.PM.enu.Familie).Lade())
 	{
-		If (..IsSchaduwBerekening) {
-			Set ^PRBS("BSS",..PRNr) = "E\TBX"
-		} Else {
-			Set ^PRBS("BS",..PRNr) = "E\TBX"
-		}
+		Set ^PRBS(..BSNode,..PRNr) = "E\TBX"
 	}
 	ElseIf (..ProductSpecificatie.GeefFamilie() = ##class(DOM.PM.enu.Familie).AluKader())
 	{
@@ -142,7 +143,7 @@
 	{
 		Set ^PRBS("BS",..PRNr) = "E\MAATWERK"
 	}
-	Set $P(^PRBS("BS",..PRNr),"\",3)="v"_"BuildersVersion"
+	Set $P(^PRBS(..BSNode,..PRNr),"\",3)="v"_"BuildersVersion"
 ]]></Implementation>
 </Method>
 
@@ -229,11 +230,7 @@
 	Set $P(Rec,"\",3) = Item.AfmetingAangerekendPerStuk                 // DimHFUitval 
 	
 	#dim BSKey As %String = ..MaakProductBouwsteen(Item,1, SamengesteldeRol,Rec)
-	If (..IsSchaduwBerekening) {
-		Set ^PRBS("BSS",..PRNr,BSKey,"D") = Rec
-	} Else {
-		Set ^PRBS("BS",..PRNr,BSKey,"D") = Rec
-	}
+	Set ^PRBS(..BSNode,..PRNr,BSKey,"D") = Rec
 		
 	Quit $$$OK
 ]]></Implementation>
@@ -283,21 +280,12 @@
 	#dim BSKey As %String = ..GeefBSKey(HalffabItem,Label,Rec,RecD)
 	
 	
-	If (..IsSchaduwBerekening) {
-		// Als de bouwsteen al bestond moeten we de aantallen verhogen
-		If ($Data(^PRBS("BSS",..PRNr,BSKey))) {
-			Set $P(Rec,"\",2) = Aantal + $P(^PRBS("BSS",..PRNr,BSKey),"\",2)	
-			Set $P(Rec,"\",13) = $P(^PRBS("BSS",..PRNr,BSKey),"\",13)_";"_$P(Rec,"\",13)
-		}
-		Set ^PRBS("BSS",..PRNr,BSKey) = Rec
-	} Else {
-		// Als de bouwsteen al bestond moeten we de aantallen verhogen
-		If ($Data(^PRBS("BS",..PRNr,BSKey))) {
-			Set $P(Rec,"\",2) = Aantal + $P(^PRBS("BS",..PRNr,BSKey),"\",2)	
-			Set $P(Rec,"\",13) = $P(^PRBS("BS",..PRNr,BSKey),"\",13)_";"_$P(Rec,"\",13)
-		}
-		Set ^PRBS("BS",..PRNr,BSKey) = Rec
+	// Als de bouwsteen al bestond moeten we de aantallen verhogen
+	If ($Data(^PRBS(..BSNode,..PRNr,BSKey))) {
+		Set $P(Rec,"\",2) = Aantal + $P(^PRBS(..BSNode,..PRNr,BSKey),"\",2)	
+		Set $P(Rec,"\",13) = $P(^PRBS(..BSNode,..PRNr,BSKey),"\",13)_";"_$P(Rec,"\",13)
 	}
+	Set ^PRBS(..BSNode,..PRNr,BSKey) = Rec
 	
 	Quit BSKey
 ]]></Implementation>
@@ -312,23 +300,13 @@
 	While 'IsValid {
 		Set KeySuffix = KeySuffix + 1
 		#dim BSKey As %String = Label_"."_##class(TECH.StringUtils).AddLeadingChar(KeySuffix,0,3)
-		If (..IsSchaduwBerekening) {
-			If $data(^PRBS("BSS",..PRNr,BSKey)) {
-				Set IsValid = ..RecordsHebbenZelfdeVoorwaarden(Rec,^PRBS("BSS",..PRNr,BSKey))
-				Set:IsValid IsValid = ($G(^PRBS("BSS",..PRNr,BSKey,"D")) = RecD )
-			}
-			Else {
-				Set IsValid = 1	
-			}
-		} Else {
-			If $data(^PRBS("BS",..PRNr,BSKey)) {
-				Set IsValid = ..RecordsHebbenZelfdeVoorwaarden(Rec,^PRBS("BS",..PRNr,BSKey))
-				Set:IsValid IsValid = ($G(^PRBS("BS",..PRNr,BSKey,"D")) = RecD )
-			}
-			Else {
-				Set IsValid = 1	
-			}
+		If $data(^PRBS(..BSNode,..PRNr,BSKey)) {
+			Set IsValid = ..RecordsHebbenZelfdeVoorwaarden(Rec,^PRBS(..BSNode,..PRNr,BSKey))
+			Set:IsValid IsValid = ($G(^PRBS(..BSNode,..PRNr,BSKey,"D")) = RecD )
 		}
+		Else {
+			Set IsValid = 1	
+		}
 	}
 	Quit BSKey
 ]]></Implementation>
@@ -363,11 +341,7 @@
 	Set $P(Record,"\",10)=..KostSortNr
 	Set $P(Record,"\",11)=Groep
 	
-	If (..IsSchaduwBerekening) {
-		Set ^PRBS("BSS",..PRNr,BSKey)=Record
-	} Else {
-		Set ^PRBS("BS",..PRNr,BSKey)=Record
-	}	
+	Set ^PRBS(..BSNode,..PRNr,BSKey)=Record
 	
 	Set ..KostSuffix = ..KostSuffix + 1
 	Set ..KostSortNr = ..KostSortNr + 1
@@ -475,11 +449,7 @@
 	
 	Do ..PrefixBestelReferentieIndienNodig(..PRNr,Product)		
 	
-	If (..IsSchaduwBerekening) {
-		Set ^PRBS("BSS",..PRNr,"KIND."_##class(TECH.StringUtils).AlignRight(..AantalKinderen,"0",3)) = Product.GeefID()_"\"_Item.Aantal_"\K\\\\\\\\PROD"
-	} Else {
-		Set ^PRBS("BS",..PRNr,"KIND."_##class(TECH.StringUtils).AlignRight(..AantalKinderen,"0",3)) = Product.GeefID()_"\"_Item.Aantal_"\K\\\\\\\\PROD"
-	}
+	Set ^PRBS(..BSNode,..PRNr,"KIND."_##class(TECH.StringUtils).AlignRight(..AantalKinderen,"0",3)) = Product.GeefID()_"\"_Item.Aantal_"\K\\\\\\\\PROD"
 	
 	Quit $$$OK
 ]]></Implementation>