Index: APPS/common/impl/KlantInstellingenService.cls.xml
===================================================================
diff -u -r40356 -r73875
--- APPS/common/impl/KlantInstellingenService.cls.xml	(.../KlantInstellingenService.cls.xml)	(revision 40356)
+++ APPS/common/impl/KlantInstellingenService.cls.xml	(.../KlantInstellingenService.cls.xml)	(revision 73875)
@@ -3,10 +3,32 @@
 <Class name="APPS.common.impl.KlantInstellingenService">
 <Super>TECH.RegisteredObject,APPS.common.KlantInstellingenService</Super>
 
+<Property name="TaxVerpakkingType">
+<Type>DOM.PM.enu.TAORVerpakkingType.AutoComplete</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ConfigMgr">
+<Type>TECH.Config.ConfigMgr</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="MagKlantTAORVerpakkingTypeBestellen">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.TAORVerpakkingType</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit 1
+<Implementation><![CDATA[	Quit $$$True
 ]]></Implementation>
 </Method>
 
@@ -41,7 +63,9 @@
 <Method name="GebruiktKlantOrderNummer">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Equals(KlantID, ##class(DOM.VKP.enu.Klant).SFS(), ##class(DOM.VKP.enu.Klant).HaefeleBelgie(), ##class(DOM.VKP.enu.Klant).HaefeleNederland())
+<Implementation><![CDATA[
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	Quit ##class(TECH.StringUtils).Equals(KlantID, Klant.SFS, Klant.OPO, Klant.HaefeleBelgie, Klant.HaefeleNederland, Klant.HaefeleDuitsland, Klant.HaefeleItalie, Klant.HaefeleOostenrijk, Klant.HaefeleDenemarken, Klant.HaefeleFrankrijk)
 ]]></Implementation>
 </Method>
 
@@ -100,15 +124,11 @@
     If (##class(TECH.StringUtils).ToUpper(VerpakkingType) = "PROBOX") {
 		If KlantID = ##class(DOM.VKP.enu.Klant).OptimaPack() {
 			Set MinimumAantal = 1
-		} ElseIf KlantID = ##class(DOM.VKP.enu.Klant).SFS() {
-			Set MinimumAantal = 4
-		} ElseIf KlantID = ##class(DOM.VKP.enu.Klant).Hein() {
-			Set MinimumAantal = 4
 		} Else {
-			Set MinimumAantal = 5
+			Set MinimumAantal = 4
 		}
     } ElseIf (##class(TECH.StringUtils).ToUpper(VerpakkingType) = "PROCOM") {
-		Set MinimumAantal = 6
+		Set MinimumAantal = 10
 	}
 	
 	Quit MinimumAantal
@@ -118,13 +138,7 @@
 <Method name="MoetProboxDragerIDOpLeveringBon">
 <FormalSpec>KLNr:TECH.String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim PartijID As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr)
-	
-	quit ##class(TECH.StringUtils).Equals( PartijID, 
-		##class(DOM.VKP.enu.Klant).Planofurn(),
-		##class(DOM.VKP.enu.Klant).WilsInterieurbouw(),
-		##class(DOM.VKP.enu.Klant).HaefeleBelgie() )
+<Implementation><![CDATA[	Quit $$$True
 ]]></Implementation>
 </Method>
 
@@ -137,17 +151,26 @@
 ]]></Implementation>
 </Method>
 
+<Method name="MoetVhossNummerOpLeveringBon">
+<FormalSpec>KLNr:TECH.String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim PartijID As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr)
+	Quit ##class(TECH.StringUtils).Equals(PartijID, ##class(DOM.VKP.enu.Klant).VanhoutPro(), ##class(DOM.VKP.enu.Klant).GroupNivelles(), ##class(DOM.VKP.enu.Klant).TestklantVanHoecke())
+]]></Implementation>
+</Method>
+
 <Method name="MagKlantLBXVerpakkingTypeBestellen">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.LBXVerpakkingType</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit 1
+<Implementation><![CDATA[	Quit $$$True
 ]]></Implementation>
 </Method>
 
 <Method name="MagKlantTBXVerpakkingTypeBestellen">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.LBXVerpakkingType</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit 1
+<Implementation><![CDATA[	Quit $$$True
 ]]></Implementation>
 </Method>
 
@@ -164,6 +187,46 @@
 <Implementation><![CDATA[	Quit (KlantID '= ##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek())
 ]]></Implementation>
 </Method>
+
+<Method name="HeeftEigenLeverbonHoofding">
+<FormalSpec>KLNr:TECH.String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim PartijID As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr)
+	Quit ((PartijID = ##class(DOM.VKP.enu.Klant).SFS()) || (PartijID = ##class(DOM.VKP.enu.Klant).DuPont()) || ..IsEenVanDeHaefeleKlanten(PartijID) || ..IsEenVanDeBlumKlanten(PartijID) )
+]]></Implementation>
+</Method>
+
+<Method name="IsEenVanDeHaefeleKlanten">
+<FormalSpec>PartijID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	Quit ##class(TECH.StringUtils).Equals(PartijID,Klant.HaefeleDenemarken,Klant.HaefeleDuitsland,Klant.HaefeleFrankrijk,Klant.HaefeleItalie,Klant.HaefeleNederland,Klant.HaefeleOostenrijk,Klant.HaefeleZwitserland)
+]]></Implementation>
+</Method>
+
+<Method name="IsEenVanDeBlumKlanten">
+<FormalSpec>PartijID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	Quit ##class(TECH.StringUtils).Equals(PartijID,Klant.BlumPolen, Klant.BlumTsjechie)
+]]></Implementation>
+</Method>
+
+<Method name="HeeftEigenLeverbonPdf">
+<FormalSpec>KLNr:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	If (##class(TECH.StringUtils).Equals(##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr),Klant.HaefeleBelgie)) && (..ConfigMgr.GeefBoolean("HaefeleBEEigenLeverbonPdf",$$$True)){
+		Quit $$$True
+	} else {
+		Quit $$$False
+	}
+]]></Implementation>
+</Method>
 </Class>