Index: APPS/EC/impl/HaefeleDEVerzendwijzeBepaler.cls.xml
===================================================================
diff -u -r67251 -r70888
--- APPS/EC/impl/HaefeleDEVerzendwijzeBepaler.cls.xml	(.../HaefeleDEVerzendwijzeBepaler.cls.xml)	(revision 67251)
+++ APPS/EC/impl/HaefeleDEVerzendwijzeBepaler.cls.xml	(.../HaefeleDEVerzendwijzeBepaler.cls.xml)	(revision 70888)
@@ -3,6 +3,23 @@
 <Class name="APPS.EC.impl.HaefeleDEVerzendwijzeBepaler">
 <Super>TECH.Mockable</Super>
 
+<Property name="ProjectSettingsAPI">
+<Type>DOM.common.ProjectSettingsAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ProjectSettingsAPI:DOM.common.ProjectSettingsAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ProjectSettingsAPI=$$$Inject(ProjectSettingsAPI,##class(DOM.common.impl.ProjectSettingsAPI).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefVerzendWijze">
 <FormalSpec>LandCode:%String,Postcode:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -104,9 +121,13 @@
 	if ((LandCode = "DK") && ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
 		Set Verzendwijze="DA2"
 	}
-
+	
 	if ((LandCode = "CH") && ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
-		Set Verzendwijze="HD3"
+		if ..ProjectSettingsAPI.IsActiefHaefeleCHViaGebruderWeissTransporteur() {
+			Set Verzendwijze="HW3"
+		} else {
+			Set Verzendwijze="HD3"
+		}
 	}
 
 	if $$$Not($$$HasLength(Verzendwijze)){
@@ -216,7 +237,11 @@
 	}
 
 	if ((LandCode = "CH") && ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
-		Set Verzendwijze="HD3"
+		if ..ProjectSettingsAPI.IsActiefHaefeleCHViaGebruderWeissTransporteur() {
+			Set Verzendwijze="HW3"
+		} else {
+			Set Verzendwijze="HD3"
+		}
 	}
 
 	if $$$Not($$$HasLength(Verzendwijze)){