Index: vhDeploy/Deploy20151118xHalffabSpecInfoBerekeningWijzeAware.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20151118xHalffabSpecInfoBerekeningWijzeAware.cls.xml	(revision 0)
+++ vhDeploy/Deploy20151118xHalffabSpecInfoBerekeningWijzeAware.cls.xml	(revision 31600)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20151118xHalffabSpecInfoBerekeningWijzeAware">
+<Super>vhDeploy.Deploy</Super>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set HalffabSpecInfoLijst = ##class(%ListOfObjects).%New()
+	#dim Query As %String = "SELECT ID FROM DOM_PM_Maatwerk_Calc_HF_impl.HalffabSpecInfo"
+	#dim ResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GetDynamicResultSet(Query, $ListBuild())
+	while ResultSet.Next() {
+		Do HalffabSpecInfoLijst.Insert(##class(DOM.PM.Maatwerk.Calc.HF.impl.HalffabSpecInfo).OpenId(ResultSet.GetDataByName("ID")))
+	}
+	
+	Set HalffabSpecInfoLijstIt = ##class(TECH.ListIterator).%New(HalffabSpecInfoLijst)
+	While (HalffabSpecInfoLijstIt.HasNext()) {
+		#dim HalffabSpecInfo As DOM.PM.Maatwerk.Calc.HF.impl.HalffabSpecInfo = HalffabSpecInfoLijstIt.Next()
+		Set HalffabSpecInfo.BerekeningWijze = ##class(DOM.PM.Maatwerk.Calc.Common.enu.BerekeningWijze).PrijsBerekening()
+		Do HalffabSpecInfo.Save()
+		#dim HalffabSpecInfoPAS As DOM.PM.Maatwerk.Calc.HF.impl.HalffabSpecInfo = HalffabSpecInfo.%ConstructClone()
+		Set HalffabSpecInfoPAS.BerekeningWijze = ##class(DOM.PM.Maatwerk.Calc.Common.enu.BerekeningWijze).ProductieAansturing()
+		Do HalffabSpecInfoPAS.Save()
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/PM/Maatwerk/Calc/HF/HalffabContext.cls.xml
===================================================================
diff -u -r31593 -r31600
--- DOM/PM/Maatwerk/Calc/HF/HalffabContext.cls.xml	(.../HalffabContext.cls.xml)	(revision 31593)
+++ DOM/PM/Maatwerk/Calc/HF/HalffabContext.cls.xml	(.../HalffabContext.cls.xml)	(revision 31600)
@@ -94,6 +94,7 @@
 		Set HalffabRepositoryInput.Variant = ..Variant
 		Set HalffabRepositoryInput.BerekenDatum = ..BerekenDatum
 		Set HalffabRepositoryInput.BerekenTag = ..BerekeningsSpecificatie.GeefBerekenTag()
+		Set HalffabRepositoryInput.BerekeningWijze = ..BerekeningsSpecificatie.BerekeningWijze
 		Set ..HalffabSpec = HalffabRepository.GeefSpecificatie(HalffabRepositoryInput)
 		Set ..BewerkingsInfoTabel = ##class(DOM.PM.Maatwerk.Calc.HF.impl.BewerkingsInfoTabel).%New()
 	 	Set ..HalffabItemsBoom = ##class(DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
Index: DOM/PM/Maatwerk/Calc/HF/HalffabRepositoryInput.cls.xml
===================================================================
diff -u -r31593 -r31600
--- DOM/PM/Maatwerk/Calc/HF/HalffabRepositoryInput.cls.xml	(.../HalffabRepositoryInput.cls.xml)	(revision 31593)
+++ DOM/PM/Maatwerk/Calc/HF/HalffabRepositoryInput.cls.xml	(.../HalffabRepositoryInput.cls.xml)	(revision 31600)
@@ -19,6 +19,10 @@
 <Type>TECH.String</Type>
 </Property>
 
+<Property name="BerekeningWijze">
+<Type>DOM.PM.Maatwerk.Calc.Common.enu.BerekeningWijze</Type>
+</Property>
+
 <Method name="BerekenDatumGet">
 <ReturnType>%Date</ReturnType>
 <Implementation><![CDATA[
Index: DOM/PM/Maatwerk/Calc/HF/impl/HalffabSpecInfo.cls.xml
===================================================================
diff -u -r29059 -r31600
--- DOM/PM/Maatwerk/Calc/HF/impl/HalffabSpecInfo.cls.xml	(.../HalffabSpecInfo.cls.xml)	(revision 29059)
+++ DOM/PM/Maatwerk/Calc/HF/impl/HalffabSpecInfo.cls.xml	(.../HalffabSpecInfo.cls.xml)	(revision 31600)
@@ -34,8 +34,13 @@
 <Parameter name="TRUNCATE" value="1"/>
 </Property>
 
+<Property name="BerekeningWijze">
+<Type>DOM.PM.Maatwerk.Calc.Common.enu.BerekeningWijze</Type>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
 <Index name="SpecUniqueIndex">
-<Properties>Familie,Variant,HalffabSpec</Properties>
+<Properties>Familie,Variant,HalffabSpec,BerekeningWijze</Properties>
 <Unique>1</Unique>
 </Index>
 
@@ -117,6 +122,9 @@
 <Value name="8">
 <Value>Variant</Value>
 </Value>
+<Value name="9">
+<Value>BerekeningWijze</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: DOM/PM/Maatwerk/Calc/HF/impl/HalffabRepository.cls.xml
===================================================================
diff -u -r31594 -r31600
--- DOM/PM/Maatwerk/Calc/HF/impl/HalffabRepository.cls.xml	(.../HalffabRepository.cls.xml)	(revision 31594)
+++ DOM/PM/Maatwerk/Calc/HF/impl/HalffabRepository.cls.xml	(.../HalffabRepository.cls.xml)	(revision 31600)
@@ -30,13 +30,21 @@
 <FormalSpec>SpecificatieInput:DOM.PM.Maatwerk.Calc.HF.HalffabRepositoryInput</FormalSpec>
 <ReturnType>DOM.PM.Maatwerk.Calc.HF.HalffabSpec</ReturnType>
 <Implementation><![CDATA[
-	#dim Query As %String = "SELECT ID FROM DOM_PM_Maatwerk_Calc_HF_impl.HalffabSpecInfo WHERE Familie = ? AND Variant = ? AND "
+	#dim Query As %String = "SELECT ID FROM DOM_PM_Maatwerk_Calc_HF_impl.HalffabSpecInfo WHERE Familie = ? AND Variant = ?"
 	#dim Params As %List = $ListBuild(SpecificatieInput.Familie, SpecificatieInput.Variant)
+	
+	If SpecificatieInput.BerekeningWijze = ##class(DOM.PM.Maatwerk.Calc.Common.enu.BerekeningWijze).PrijsBerekening() {
+		Set Query = Query_" AND BerekeningWijze IS NULL"
+	} Else {
+		Set Query = Query_" AND BerekeningWijze = ?"
+		Set Params = Params_$ListBuild(SpecificatieInput.BerekeningWijze)
+	}
+	
 	If SpecificatieInput.BerekenTag = "" {
-		Set Query = Query_"GeldigVan <= ? AND GeldigTot >= ? AND Tag is null"
+		Set Query = Query_" AND GeldigVan <= ? AND GeldigTot >= ? AND Tag is null"
 		Set Params = Params_$ListBuild(SpecificatieInput.BerekenDatum, SpecificatieInput.BerekenDatum)
 	} Else {
-		Set Query = Query_"Tag = ?"
+		Set Query = Query_" AND Tag = ?"
 		Set Params = Params_$ListBuild(SpecificatieInput.BerekenTag)
 	}
 	#dim ResultSet As TECH.ResultSet = ..QueryUitvoerder.VoerUit(Query, Params)