Index: DOM/PM/impl/DataM/DataMBouwsteenCreator.cls.xml
===================================================================
diff -u -r58910 -r65818
--- DOM/PM/impl/DataM/DataMBouwsteenCreator.cls.xml	(.../DataMBouwsteenCreator.cls.xml)	(revision 58910)
+++ DOM/PM/impl/DataM/DataMBouwsteenCreator.cls.xml	(.../DataMBouwsteenCreator.cls.xml)	(revision 65818)
@@ -57,6 +57,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="IsSchaduwBerekening">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ProductTypeAPI:DOM.PM.ProductTypeAPI="",LangtekstBewaarder:DOM.PM.LangtekstBewaarder=""</FormalSpec>
 <Private>1</Private>
@@ -75,7 +80,7 @@
 </Method>
 
 <Method name="Init">
-<FormalSpec>PRNr:%Integer,ProductSpecificatie:DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie,BerekeningsSpecificatie:DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,KostItem:DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItem</FormalSpec>
+<FormalSpec>PRNr:%Integer,ProductSpecificatie:DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie,BerekeningsSpecificatie:DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie,HalffabItemsBoom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,KostItem:DOM.PM.Maatwerk.Calc.Kost.SamengesteldKostItem,IsSchaduwBerekening:%Boolean=0</FormalSpec>
 <Implementation><![CDATA[
 	Set ..ProductTypeAPI = ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI()
 	Set ..LangtekstBewaarder = ##class(DOM.PM.LangtekstBewaarder).%New()
@@ -85,11 +90,15 @@
 	Set ..BerekeningsSpecificatie = BerekeningsSpecificatie
 	Set ..HalffabItemsBoom = HalffabItemsBoom
 	Set ..KostItem = KostItem
+	Set ..IsSchaduwBerekening = IsSchaduwBerekening
 	
 	// Omdat DELOBJ het linktype reset gaan we dit lokaal bewaren
 	#dim LinkType As %String = $P(^KPR(PRNr,0),"\",23)
 	// Verwijderen van reeds bestaande bouwstenen
-	Do DELOBJ^PRBS(PRNr)
+	If $$$Not(..IsSchaduwBerekening) {
+		Do DELOBJ^PRBS(PRNr)
+	}
+	
 	Set $P(^KPR(PRNr,0),"\",23) = LinkType
 	
 	// Enkele zaken invullen
@@ -115,7 +124,11 @@
 <Implementation><![CDATA[
 	If (..ProductSpecificatie.GeefFamilie() = ##class(DOM.PM.enu.Familie).Lade())
 	{
-		Set ^PRBS("BS",..PRNr) = "E\TBX"
+		If (..IsSchaduwBerekening) {
+			Set ^PRBS("BSS",..PRNr) = "E\TBX"
+		} Else {
+			Set ^PRBS("BS",..PRNr) = "E\TBX"
+		}
 	}
 	ElseIf (..ProductSpecificatie.GeefFamilie() = ##class(DOM.PM.enu.Familie).AluKader())
 	{
@@ -216,10 +229,12 @@
 	Set $P(Rec,"\",3) = Item.AfmetingAangerekendPerStuk                 // DimHFUitval 
 	
 	#dim BSKey As %String = ..MaakProductBouwsteen(Item,1, SamengesteldeRol,Rec)
-	Set ^PRBS("BS",..PRNr,BSKey,"D") = Rec
-	
-	
-	
+	If (..IsSchaduwBerekening) {
+		Set ^PRBS("BSS",..PRNr,BSKey,"D") = Rec
+	} Else {
+		Set ^PRBS("BS",..PRNr,BSKey,"D") = Rec
+	}
+		
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -267,13 +282,22 @@
 
 	#dim BSKey As %String = ..GeefBSKey(HalffabItem,Label,Rec,RecD)
 	
-	// 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) 	
-
+	
+	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
 	}
-	Set ^PRBS("BS",..PRNr,BSKey) = Rec
 	
 	Quit BSKey
 ]]></Implementation>
@@ -285,16 +309,26 @@
 <Implementation><![CDATA[
 	#dim KeySuffix As %Integer = 0
 	#dim IsValid As %Boolean = 0
-	while 'IsValid {
-		set KeySuffix = KeySuffix + 1
-		#dim BSKey As %String = Label_"."_##class(TECH.StringUtils).AddLeadingChar(KeySuffix,0,3)		
-		if $data(^PRBS("BS",..PRNr,BSKey)) {
-			set IsValid = ..RecordsHebbenZelfdeVoorwaarden(Rec,^PRBS("BS",..PRNr,BSKey))
-			set:IsValid IsValid = ($G(^PRBS("BS",..PRNr,BSKey,"D"))=RecD )
+	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	
+			}
 		}
-		else {
-			set IsValid = 1	
-		}	
 	}
 	Quit BSKey
 ]]></Implementation>
@@ -328,8 +362,13 @@
 	
 	Set $P(Record,"\",10)=..KostSortNr
 	Set $P(Record,"\",11)=Groep
-	Set ^PRBS("BS",..PRNr,BSKey)=Record
 	
+	If (..IsSchaduwBerekening) {
+		Set ^PRBS("BSS",..PRNr,BSKey)=Record
+	} Else {
+		Set ^PRBS("BS",..PRNr,BSKey)=Record
+	}	
+	
 	Set ..KostSuffix = ..KostSuffix + 1
 	Set ..KostSortNr = ..KostSortNr + 1
 	
@@ -436,7 +475,11 @@
 	
 	Do ..PrefixBestelReferentieIndienNodig(..PRNr,Product)		
 	
-	Set ^PRBS("BS",..PRNr,"KIND."_##class(TECH.StringUtils).AlignRight(..AantalKinderen,"0",3)) = Product.GeefID()_"\"_Item.Aantal_"\K\\\\\\\\PROD"
+	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"
+	}
 	
 	Quit $$$OK
 ]]></Implementation>