Index: APPS/EC/enu/UniShopVerwerker.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/enu/UniShopVerwerker.cls.xml	(.../UniShopVerwerker.cls.xml)	(revision 65150)
+++ APPS/EC/enu/UniShopVerwerker.cls.xml	(.../UniShopVerwerker.cls.xml)	(revision 67229)
@@ -7,11 +7,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;SFS;HFLB;HFLE;VHEPN;DUPO;KISCH;HELMY;RAEM;DARO;HEIN;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;JBAR;BIBO;CAMP;RINI;FURN;YSPL;HFLD;KLNR;LAYR;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH</Default>
+<Default>;SFS;HFLB;HFLE;VHEPN;DUPO;KISCH;HELMY;RAEM;DARO;HEIN;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;JBAR;BIBO;CAMP;RINI;FURN;YSPL;HFLD;KLNR;LAYR;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH;HFLNO</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;SFS;HaefeleBelgie;HaefeleNederland;VHEPN;Dupont;Kisch;Destil;VanRaemdonck;Daro;Hein;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;JBarth;BiemarBois;CampeTonny;Rini;Furnifit;YachtSupplier;HaefeleDuitsland;Kleiner;Layer;HahleOy;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFR;HaefeleDK;HaefeleCH</Default>
+<Default>;SFS;HaefeleBelgie;HaefeleNederland;VHEPN;Dupont;Kisch;Destil;VanRaemdonck;Daro;Hein;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;JBarth;BiemarBois;CampeTonny;Rini;Furnifit;YachtSupplier;HaefeleDuitsland;Kleiner;Layer;HahleOy;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFR;HaefeleDK;HaefeleCH;HaefeleNoorwegen</Default>
 </Parameter>
 
 <Method name="SFS">
@@ -273,6 +273,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleNoorwegen">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.UniShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HaefeleNoorwegen()
+]]></Implementation>
+</Method>
+
 <Method name="OPO">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.EC.enu.UniShopVerwerker</ReturnType>
Index: APPS/VKP/Korting/impl/KortingFactory.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/VKP/Korting/impl/KortingFactory.cls.xml	(.../KortingFactory.cls.xml)	(revision 65150)
+++ APPS/VKP/Korting/impl/KortingFactory.cls.xml	(.../KortingFactory.cls.xml)	(revision 67229)
@@ -74,6 +74,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..KortingParser = ##class(APPS.VKP.Klantspecifiek.Haefele.KortingParser).%New()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFR">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..KortingParser = ##class(APPS.VKP.Klantspecifiek.Haefele.KortingParser).%New()
Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml	(.../KlantRapporteurVhisie4.cls.xml)	(revision 65150)
+++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml	(.../KlantRapporteurVhisie4.cls.xml)	(revision 67229)
@@ -141,6 +141,10 @@
 <FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 65150)
+++ APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 67229)
@@ -65,6 +65,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleNoorwegen()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleIT">
 <FormalSpec>HaefeleITPersonality:DOM.common.HaefeleITPersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleItalie()
Index: APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml	(.../PersonalityEnVerwerkerLinker.cls.xml)	(revision 65150)
+++ APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml	(.../PersonalityEnVerwerkerLinker.cls.xml)	(revision 67229)
@@ -54,6 +54,8 @@
 		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleSE()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFinland() {
 		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleFI()
+	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleNoorwegen() {
+		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleNO()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFrankrijk() {
 		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleFR()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleDenemarken() {
@@ -145,6 +147,8 @@
 		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZweden()
 	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).HaefeleFI() {
 		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFinland()
+	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).HaefeleNO() {
+		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).HaefeleNoorwegen()
 	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).HaefeleFR() {
 		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFrankrijk()
 	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).HaefeleDK() {
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml	(.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml)	(revision 65150)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml	(.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml)	(revision 67229)
@@ -99,6 +99,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNoorwegen">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleNO_1000_"_..GebruikerID
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..VerwachteGebruikerID = "kisch_1000_"_..GebruikerID
Index: APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 65150)
+++ APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 67229)
@@ -51,6 +51,8 @@
 		Do ..VerwerkHaefeleItalie()
 	} ElseIf UniShopVerwerker = "HFLE" {
 		Do ..VerwerkHaefeleNederland()
+	} ElseIf UniShopVerwerker = "HFLNO" {
+		Do ..VerwerkHaefeleNoorwegen()
 	} ElseIf UniShopVerwerker = "HFLAT" {
 		Do ..VerwerkHaefeleOostenrijk()
 	} ElseIf UniShopVerwerker = "HFLSE" {
@@ -210,6 +212,11 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNoorwegen">
+<Abstract>1</Abstract>
+<Private>1</Private>
+</Method>
+
 <Method name="VerwerkHaefeleOostenrijk">
 <Abstract>1</Abstract>
 <Private>1</Private>
@@ -219,7 +226,6 @@
 <Method name="VerwerkHaefeleZweden">
 <Abstract>1</Abstract>
 <Private>1</Private>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleZwitserland">
Index: vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 65150)
+++ vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 67229)
@@ -167,6 +167,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNO",HaefeleNOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml
===================================================================
diff -u -r65467 -r67229
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 65467)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 67229)
@@ -264,6 +264,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	;Do ..MailVerzenderHandel.Rapporteer(..Offerte)
+	Do ..HttpZenderHaefele.Verzend(..Offerte)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 65150)
+++ vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 67229)
@@ -55,6 +55,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 65150)
+++ APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 67229)
@@ -138,6 +138,10 @@
 <FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 </Method>
Index: DOM/VKP/enu/Klant/Verwerker.cls.xml
===================================================================
diff -u -r66984 -r67229
--- DOM/VKP/enu/Klant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 66984)
+++ DOM/VKP/enu/Klant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 67229)
@@ -92,6 +92,8 @@
 		Do ..VerwerkHaefeleItalie()
 	} ElseIf Klant = "K||2671" {
 		Do ..VerwerkHaefeleNederland()
+	} ElseIf Klant = "K||36666" {
+		Do ..VerwerkHaefeleNoorwegen()
 	} ElseIf Klant = "K||35415" {
 		Do ..VerwerkHaefeleOostenrijk()
 	} ElseIf Klant = "K||36412" {
@@ -477,6 +479,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNoorwegen">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleOostenrijk">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 65150)
+++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 67229)
@@ -95,6 +95,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..WebshopVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleNoorwegen()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..WebshopVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Hein()
Index: vhTest/Integratie/TestBase.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Integratie/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 65150)
+++ vhTest/Integratie/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 67229)
@@ -172,6 +172,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="UpdateHaefeleNOKlantData">
+<Final>1</Final>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,KlantNaam:%String,Taal:DOM.enu.Taal=##class(DOM.enu.Taal).Noors()</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim KlantBewaarder As APPS.VKP.KlantDataBewaarder = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefKlantDataBewaarder()
+	set KlantData = ##class(DOM.common.dto.KlantData).%New()
+	set KlantData.ID = KlantID
+	set KlantData.Naam = KlantNaam
+	set KlantData.Taal = Taal
+	do KlantBewaarder.Bewaar(##class(DOM.common.HaefeleNOPersonality).Instance(),KlantData)
+]]></Implementation>
+</Method>
+
 <Method name="UpdateKlantData">
 <Final>1</Final>
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,KlantNaam:%String,Taal:DOM.enu.Taal=##class(DOM.enu.Taal).Nederlands(),Personality:DOM.common.Personality</FormalSpec>
Index: APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 65150)
+++ APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 67229)
@@ -142,6 +142,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleNoorwegen">
+<Type>%String</Type>
+<InitialExpression>"HFLNO"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleOostenrijk">
 <Type>%String</Type>
 <InitialExpression>"HFLAT"</InitialExpression>
Index: APPS/VKP/Korting/impl/EDIVerwerker.cls.xml
===================================================================
diff -u -r65855 -r67229
--- APPS/VKP/Korting/impl/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 65855)
+++ APPS/VKP/Korting/impl/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 67229)
@@ -38,6 +38,11 @@
 <Default>fiHAFELE</Default>
 </Parameter>
 
+<Parameter name="DomeinCodeHaefeleNO">
+<Type>%String</Type>
+<Default>noHAFELE</Default>
+</Parameter>
+
 <Parameter name="DomeinCodeHaefeleFR">
 <Type>%String</Type>
 <Default>frHAFELE</Default>
@@ -164,6 +169,8 @@
 		Set Personality = ##class(DOM.common.enu.Personality).HaefeleDK()
 	}ElseIf KlantNaam = ..#DomeinCodeHaefeleCH {
 		Set Personality = ##class(DOM.common.enu.Personality).HaefeleCH()
+	}ElseIf KlantNaam = ..#DomeinCodeHaefeleNO {
+		Set Personality = ##class(DOM.common.enu.Personality).HaefeleNO()
 	}Else{
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bestand '"_BestandNaam_"' wordt niet ondersteund voor verwerking."))
 	}
Index: BL/Legacy/FactuurMailAfzenderBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- BL/Legacy/FactuurMailAfzenderBepaler.cls.xml	(.../FactuurMailAfzenderBepaler.cls.xml)	(revision 65150)
+++ BL/Legacy/FactuurMailAfzenderBepaler.cls.xml	(.../FactuurMailAfzenderBepaler.cls.xml)	(revision 67229)
@@ -117,6 +117,10 @@
 <FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 </Method>
Index: vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 65150)
+++ vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 67229)
@@ -55,6 +55,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml
===================================================================
diff -u -r65150 -r67229
--- BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 65150)
+++ BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 67229)
@@ -93,6 +93,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleNO">
+<Type>%String</Type>
+<InitialExpression>"HAEFELENO"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleSE">
 <Type>%String</Type>
 <InitialExpression>"HAEFELESE"</InitialExpression>
Index: cspBasis/TBX/enu/Verwerker.cls.xml
===================================================================
diff -u -r65150 -r67229
--- cspBasis/TBX/enu/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 65150)
+++ cspBasis/TBX/enu/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 67229)
@@ -7,11 +7,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;SFS;LMC;MBHO;HFLB;VHEPN;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;HFLD;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH</Default>
+<Default>;SFS;LMC;MBHO;HFLB;VHEPN;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;HFLD;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH;HFLNO</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;VHEPN;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;HaefeleDuitsland;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFrankrijk;HaefeleDenemarken;HaefeleZwitserland</Default>
+<Default>;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;VHEPN;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;HaefeleDuitsland;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFrankrijk;HaefeleDenemarken;HaefeleZwitserland;HaefeleNoorwegen</Default>
 </Parameter>
 
 <Method name="SFS">
@@ -139,6 +139,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleNoorwegen">
+<ClassMethod>1</ClassMethod>
+<ReturnType>cspBasis.TBX.enu.Verwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HaefeleNoorwegen()
+]]></Implementation>
+</Method>
+
 <Method name="VanRaemdonck">
 <ClassMethod>1</ClassMethod>
 <ReturnType>cspBasis.TBX.enu.Verwerker</ReturnType>
Index: APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 65150)
+++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 67229)
@@ -196,6 +196,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ControleerReedsBesteld()
+	Do ..ControleerToegangEnPrijzen()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 65150)
+++ vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 67229)
@@ -146,6 +146,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/common/HaefeleNOPersonality.cls.xml
===================================================================
diff -u -r67227 -r67229
--- DOM/common/HaefeleNOPersonality.cls.xml	(.../HaefeleNOPersonality.cls.xml)	(revision 67227)
+++ DOM/common/HaefeleNOPersonality.cls.xml	(.../HaefeleNOPersonality.cls.xml)	(revision 67229)
@@ -26,7 +26,7 @@
 
 <Method name="GeefLeverancierData">
 <ReturnType>DOM.common.LeverancierPersonalityData</ReturnType>
-<Implementation><![CDATA[	quit ##class(DOM.common.LeverancierPersonalityData).%New(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).HaefeleZweden())
+<Implementation><![CDATA[	quit ##class(DOM.common.LeverancierPersonalityData).%New(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).HaefeleNoorwegen())
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 65150)
+++ vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 67229)
@@ -57,6 +57,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml
===================================================================
diff -u -r64703 -r67229
--- cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64703)
+++ cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 67229)
@@ -72,6 +72,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleNoorwegen">
+<Type>%String</Type>
+<InitialExpression>"HFLNO"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleOostenrijk">
 <Type>%String</Type>
 <InitialExpression>"HFLAT"</InitialExpression>
Index: vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 65150)
+++ vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 67229)
@@ -61,6 +61,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: BL/Legacy/DCPRINT2.cls.xml
===================================================================
diff -u -r66174 -r67229
--- BL/Legacy/DCPRINT2.cls.xml	(.../DCPRINT2.cls.xml)	(revision 66174)
+++ BL/Legacy/DCPRINT2.cls.xml	(.../DCPRINT2.cls.xml)	(revision 67229)
@@ -157,7 +157,7 @@
 	
 	If (PersonalityId = Personality.Noteborn) {
 		Set IsAfdrukOpBlancoPapier = $$$True
-	} ElseIf (PersonalityId = Personality.HaefeleNL) || (PersonalityId = Personality.HaefeleDE)|| (PersonalityId = Personality.HaefeleIT) || (PersonalityId = Personality.HaefeleAT)  || (PersonalityId = Personality.HaefeleSE) || (PersonalityId = Personality.HaefeleFI) || (PersonalityId = Personality.HaefeleFR) || (PersonalityId = Personality.HaefeleDK) || (PersonalityId = Personality.HaefeleCH){
+	} ElseIf (PersonalityId = Personality.HaefeleNL) || (PersonalityId = Personality.HaefeleDE)|| (PersonalityId = Personality.HaefeleIT) || (PersonalityId = Personality.HaefeleAT)  || (PersonalityId = Personality.HaefeleSE) || (PersonalityId = Personality.HaefeleFI) || (PersonalityId = Personality.HaefeleFR) || (PersonalityId = Personality.HaefeleDK) || (PersonalityId = Personality.HaefeleCH)  || (PersonalityId = Personality.HaefeleNO) {
 		Set IsAfdrukOpBlancoPapier = $$$True
 	} ElseIf (PersonalityId = Personality.HaefeleBE) && (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHaefeleBENaarEindklant()) {
 		Set IsAfdrukOpBlancoPapier = $$$True
Index: vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml
===================================================================
diff -u -r67081 -r67229
--- vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 67081)
+++ vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 67229)
@@ -67,6 +67,7 @@
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HahleOy, VerwachteLadetypes)
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleSE, VerwachteLadetypes)
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleFI, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleNO, VerwachteLadetypes)
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleIT, VerwachteLadetypes)
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleAT, VerwachteLadetypes)
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleFR, VerwachteLadetypes)
Index: APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r66984 -r67229
--- APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 66984)
+++ APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 67229)
@@ -106,6 +106,11 @@
 				Set Partij = ..PartijApi.GeefPartij(KlantID)
 				Set VerzendWijzeID = ..HaefeleDEVerzendwijzeBepaler.GeefVerzendWijze(LeverAdres.GeefLand().GeefCode(),LeverAdres.GeefPostcode())
 				Set VerzendWijze =  ##class(APPS.VKP.VerzendWijze).%New(..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantID),VerzendWijzeID,LeverAdres.GeefLand().GeefCode(),LeverAdres.GeefPostcode())
+			} ElseIf (Winkelkar.GeefPersonalityID() = Personality.HaefeleNO){
+				Set KlantID = ##class(DOM.VKP.enu.Klant).HaefeleNoorwegen()
+				Set Partij = ..PartijApi.GeefPartij(KlantID)
+				Set VerzendWijzeID = ..HaefeleDEVerzendwijzeBepaler.GeefVerzendWijze(LeverAdres.GeefLand().GeefCode(),LeverAdres.GeefPostcode())
+				Set VerzendWijze =  ##class(APPS.VKP.VerzendWijze).%New(..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantID),VerzendWijzeID,LeverAdres.GeefLand().GeefCode(),LeverAdres.GeefPostcode())
 			} ElseIf (Winkelkar.GeefPersonalityID() = Personality.HaefeleIT){
 				Set KlantID = ##class(DOM.VKP.enu.Klant).HaefeleItalie()
 				Set Partij = ..PartijApi.GeefPartij(KlantID)
Index: APPS/EC/impl/KlantDataReferentieBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 65150)
+++ APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 67229)
@@ -330,6 +330,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..GeefKlantIDVoorInfoVanOfferte(..Offerte)			
+	#dim KlantData As DOM.VKP.impl.KlantData = ..DataService.GeefKlantData(HaefeleNOPersonality.GeefID(), KlantID)
+	
+	#dim Naam As %String = KlantData.Naam
+	Do ..VoegToeIndienNodig(Naam)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml	(.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml)	(revision 65150)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml	(.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml)	(revision 67229)
@@ -99,6 +99,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNoorwegen">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleNO_1000_1"
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..VerwachteGebruikerID = "kisch_1000_1"
Index: APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml	(.../OfferteKopieerder.cls.xml)	(revision 65150)
+++ APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml	(.../OfferteKopieerder.cls.xml)	(revision 67229)
@@ -63,7 +63,7 @@
 	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	#dim IsBestelOpmerkingTeKopieren As %Boolean = $$$True
 	
-	If ##class(TECH.StringUtils).Equals(Offerte.GeefPersonalityID(), Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,Personality.HaefeleIT,Personality.HaefeleAT,Personality.HaefeleDK,Personality.HaefeleDK,Personality.HaefeleCH ) {   ; , ##class(DOM.common.enu.Personality).SFS() 
+	If ##class(TECH.StringUtils).Equals(Offerte.GeefPersonalityID(), Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,Personality.HaefeleIT,Personality.HaefeleAT,Personality.HaefeleDK,Personality.HaefeleDK,Personality.HaefeleCH,Personality.HaefeleNO ) {   ; , ##class(DOM.common.enu.Personality).SFS() 
 		// Handel Bevestigt ViaWebService, dus de bestelopmerking niet overnemen. 
 		Set IsBestelOpmerkingTeKopieren = $$$False
 	}
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/VerzendingService.cls.xml
===================================================================
diff -u -r65186 -r67229
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/VerzendingService.cls.xml	(.../VerzendingService.cls.xml)	(revision 65186)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/VerzendingService.cls.xml	(.../VerzendingService.cls.xml)	(revision 67229)
@@ -131,7 +131,7 @@
 			(KlantPartijID = Klant.HaefeleFrankrijk) ||
 			(KlantPartijID = Klant.HaefeleDenemarken) ||
 			(KlantPartijID = Klant.HaefeleZwitserland) ||
-			##class(TECH.StringUtils).StartsWith(KlantPartijID,"hfleDE","hfleSE","hfleFI","hfleIT","hfleAT","hfleFR","hfleDK","hfleCH") ||
+			##class(TECH.StringUtils).StartsWith(KlantPartijID,"hfleDE","hfleSE","hfleFI","hfleNO","hfleIT","hfleAT","hfleFR","hfleDK","hfleCH") ||
 			( ##class(TECH.StringUtils).StartsWith(KlantPartijID,"raem") && ..ProjectSettingsAPI.IsActiefVanRaemdonckNaarEindklant()  )
 		)
 ]]></Implementation>
Index: vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 65150)
+++ vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 67229)
@@ -160,6 +160,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNO",HaefeleNOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
Index: APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml	(.../OfferteKlantDataBepaler.cls.xml)	(revision 65150)
+++ APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml	(.../OfferteKlantDataBepaler.cls.xml)	(revision 67229)
@@ -89,6 +89,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyKlantData()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInDummyKlantData()
Index: APPS/EC/impl/ECommerceAPI.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 65150)
+++ APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 67229)
@@ -148,6 +148,8 @@
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleSE).%New()
 	} ElseIf (Personality.GeefID() = ..Personality.HaefeleFI) {
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleFI).%New()
+	} ElseIf (Personality.GeefID() = ..Personality.HaefeleNO) {
+		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleNO).%New()
 	} ElseIf (Personality.GeefID() = ..Personality.HaefeleIT) {
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleIT).%New()
 	} ElseIf (Personality.GeefID() = ..Personality.HaefeleAT) {
Index: DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r67081 -r67229
--- DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 67081)
+++ DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 67229)
@@ -96,6 +96,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..ToegelatenLadetypes = ##class(%ListOfDataTypes).%New()
+	
+	Do ..ToegelatenLadetypes.Insert("TAX")
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleIT">
 <FormalSpec>HaefeleITPersonality:DOM.common.HaefeleITPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 65150)
+++ APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 67229)
@@ -109,6 +109,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..ToonExceptie(HaefeleNOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..ToonExceptie(KischPersonality)
Index: vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml
===================================================================
diff -u -r53267 -r67229
--- vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml	(.../Result.xml)	(revision 53267)
+++ vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml	(.../Result.xml)	(revision 67229)
@@ -2,15 +2,15 @@
 <AxdEntity_OrderHeader xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgSalesOrderInQuery" class="entity">
   <ConfirmBody>KlantOrderNummer</ConfirmBody>
   <CurrencyCode>EUR</CurrencyCode>
-  <CustAccount>01234</CustAccount>
+  <CustAccount>1234</CustAccount>
   <CustomerRef>CommissieReferentie</CustomerRef>
   <DeliveryName>Een Belg</DeliveryName>
   <DlvAddrCity>Sint-Niklaas</DlvAddrCity>
   <DlvAddrCountry>BE</DlvAddrCountry>
   <DlvAddrStreet1>Ankerstraat 91</DlvAddrStreet1>
   <DlvAddrZipCode>9100</DlvAddrZipCode>
   <DlvMode>DI1</DlvMode>
-  <InvoiceAccount>01234</InvoiceAccount>
+  <InvoiceAccount>1234</InvoiceAccount>
   <LocationId>AXLeveradresId</LocationId>
   <MessageId>MessageId</MessageId>
   <MultiPersonalityLinkContainer>OorsprongKetting</MultiPersonalityLinkContainer>
Index: APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml	(.../LoginParametersNaarSessieConverter.cls.xml)	(revision 65150)
+++ APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml	(.../LoginParametersNaarSessieConverter.cls.xml)	(revision 67229)
@@ -110,6 +110,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..WebshopSessie = ##class(APPS.EC.impl.HaefeleFIWebshopSessie).%New(..LoginParameters.GebruikerID)
+	Do ..BewaarKlant(HaefeleNOPersonality,..GeefKlantData())
+	Do ..WebshopSessie.ZetKlant(..LoginParameters.KlantID,..LoginParameters.KlantNaam)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Utils/DOM/VKP/LeverAdres.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 65150)
+++ vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 67229)
@@ -176,6 +176,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Noors">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdres.ZetNaam("Noors adres")
+	Do LeverAdres.ZetLandNr(123456)
+	Do LeverAdres.ZetPostcode("123456")
+	Do LeverAdres.ZetStraat("No Adress")
+	Do LeverAdres.ZetGemeente("Unknown")
+	Quit LeverAdres
+]]></Implementation>
+</Method>
+
 <Method name="NietEuLid">
 <ClassMethod>1</ClassMethod>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
Index: APPS/EC/impl/HaefeleNOWebshopSessie.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/HaefeleNOWebshopSessie.cls.xml	(revision 0)
+++ APPS/EC/impl/HaefeleNOWebshopSessie.cls.xml	(revision 67229)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.HaefeleNOWebshopSessie">
+<Super>APPS.EC.impl.HandelWebshopSessie</Super>
+
+<Method name="GeefTeGebruikenPersonalityID">
+<Private>1</Private>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.enu.Personality).HaefeleNO()
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml
===================================================================
diff -u -r64703 -r67229
--- cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64703)
+++ cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 67229)
@@ -30,6 +30,8 @@
 		Do ..VerwerkHaefeleItalie()
 	} ElseIf Verwerker = "HFLE" {
 		Do ..VerwerkHaefeleNederland()
+	} ElseIf Verwerker = "HFLNO" {
+		Do ..VerwerkHaefeleNoorwegen()
 	} ElseIf Verwerker = "HFLAT" {
 		Do ..VerwerkHaefeleOostenrijk()
 	} ElseIf Verwerker = "HFLSE" {
@@ -111,6 +113,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNoorwegen">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleOostenrijk">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 65150)
+++ vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 67229)
@@ -147,6 +147,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNO",HaefeleNOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
Index: vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 65150)
+++ vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 67229)
@@ -154,6 +154,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNO",HaefeleNOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
Index: vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 65150)
+++ vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 67229)
@@ -154,6 +154,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNO",HaefeleNOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
Index: DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r66343 -r67229
--- DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 66343)
+++ DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 67229)
@@ -241,6 +241,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
+	
+	#dim KlantData As DOM.VKP.impl.HaefeleDEKlantData = ..OpenKlantData(..KlantID, HaefeleNOPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, HaefeleNOPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 65150)
+++ vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 67229)
@@ -103,6 +103,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: WSimpl/Unishop/Login/ParametersHaefeleNO.cls.xml
===================================================================
diff -u
--- WSimpl/Unishop/Login/ParametersHaefeleNO.cls.xml	(revision 0)
+++ WSimpl/Unishop/Login/ParametersHaefeleNO.cls.xml	(revision 67229)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Unishop.Login.ParametersHaefeleNO">
+<Super>WSimpl.Unishop.Login.Parameters</Super>
+
+<Property name="KlantNaam">
+<Type>%String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r65846 -r67229
--- WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 65846)
+++ WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 67229)
@@ -190,7 +190,7 @@
 	Set UniShopVerwerker = ##class(APPS.EC.enu.UniShopVerwerker.AutoComplete).%New()
 	If ((LeverDatum = HuidigeDatum)) && ##class(TECH.StringUtils).Equals(..Shop,UniShopVerwerker.HaefeleBelgie, UniShopVerwerker.HaefeleNederland,UniShopVerwerker.OPO) {
 		Do VanHoeckeOfferte.ZetLeverDatum(..BepaalLeverDatum(VanHoeckeOfferte.GeefWensLeverDatum(),LeverDatum))
-	} elseif (##class(TECH.StringUtils).Equals(..Shop, UniShopVerwerker.HaefeleDuitsland,UniShopVerwerker.HaefeleZweden,UniShopVerwerker.HaefeleFinland,UniShopVerwerker.HaefeleItalie,UniShopVerwerker.HaefeleOostenrijk,UniShopVerwerker.HaefeleDenemarken,UniShopVerwerker.HaefeleFrankrijk,UniShopVerwerker.HaefeleZwitserland)) {
+	} elseif (##class(TECH.StringUtils).Equals(..Shop, UniShopVerwerker.HaefeleDuitsland,UniShopVerwerker.HaefeleZweden,UniShopVerwerker.HaefeleFinland,UniShopVerwerker.HaefeleItalie,UniShopVerwerker.HaefeleOostenrijk,UniShopVerwerker.HaefeleDenemarken,UniShopVerwerker.HaefeleFrankrijk,UniShopVerwerker.HaefeleZwitserland,UniShopVerwerker.HaefeleNoorwegen)) {
 		Do VanHoeckeOfferte.ZetLeverDatum(..GeefWensLeverDatumInJuistFormaat(VanHoeckeOfferte.GeefWensLeverDatum()))
 	} Else {
 		Do VanHoeckeOfferte.ZetLeverDatum(LeverDatum)
Index: vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 65150)
+++ vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 67229)
@@ -154,6 +154,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNO",HaefeleNOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r65150 -r67229
--- WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 65150)
+++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 67229)
@@ -184,6 +184,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleSE).%New(),HaefeleNOPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),VanRaemdonckPersonality.GeefPrefix())
Index: DOM/VKP/enu/Klant.cls.xml
===================================================================
diff -u -r66984 -r67229
--- DOM/VKP/enu/Klant.cls.xml	(.../Klant.cls.xml)	(revision 66984)
+++ DOM/VKP/enu/Klant.cls.xml	(.../Klant.cls.xml)	(revision 67229)
@@ -7,7 +7,7 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413</Default>
+<Default>,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413,K||36666</Default>
 </Parameter>
 
 <Method name="Keller">
@@ -775,6 +775,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleNoorwegen">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.VKP.enu.Klant</ReturnType>
+<Implementation><![CDATA[	Quit ..MaakPartijID(36666)
+]]></Implementation>
+</Method>
+
 <Method name="MaakPartijID">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlantNummer:%String</FormalSpec>
Index: APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml
===================================================================
diff -u -r67201 -r67229
--- APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67201)
+++ APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67229)
@@ -90,6 +90,7 @@
 		||(PersonalityID = Personality.HaefeleDE)
 		||(PersonalityID = Personality.HaefeleSE)
 		||(PersonalityID = Personality.HaefeleFI)
+		||(PersonalityID = Personality.HaefeleNO)
 		||(PersonalityID = Personality.HaefeleFR)
 		||(PersonalityID = Personality.HaefeleDK)
 		||(PersonalityID = Personality.HaefeleIT)
Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml
===================================================================
diff -u -r66984 -r67229
--- DOM/VKP/enu/Klant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 66984)
+++ DOM/VKP/enu/Klant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 67229)
@@ -289,6 +289,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleNoorwegen">
+<Type>%String</Type>
+<InitialExpression>"K||36666"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleOostenrijk">
 <Type>%String</Type>
 <InitialExpression>"K||35415"</InitialExpression>
Index: BL/Flow/Proxy/pxLevering.cls.xml
===================================================================
diff -u -r66239 -r67229
--- BL/Flow/Proxy/pxLevering.cls.xml	(.../pxLevering.cls.xml)	(revision 66239)
+++ BL/Flow/Proxy/pxLevering.cls.xml	(.../pxLevering.cls.xml)	(revision 67229)
@@ -342,7 +342,7 @@
 	
 	#dim HeeftEigenHoofding As %Boolean = $$$False
 
-	Set HeeftEigenHoofding = ##class(TECH.StringUtils).Equals(AfzenderHoofdingDto.HeaderType, HoofdingType.HaefeleSE,HoofdingType.HaefeleFI,HoofdingType.HaefeleNL,HoofdingType.HaefeleDE,HoofdingType.HaefeleAT,HoofdingType.HaefeleIT,HoofdingType.Noteborn,HoofdingType.SFS,HoofdingType.VanRaemdonck, HoofdingType.CampeTonny,HoofdingType.OPO)
+	Set HeeftEigenHoofding = ##class(TECH.StringUtils).Equals(AfzenderHoofdingDto.HeaderType, HoofdingType.HaefeleSE,HoofdingType.HaefeleFI, HoofdingType.HaefeleNO,HoofdingType.HaefeleNL,HoofdingType.HaefeleDE,HoofdingType.HaefeleAT,HoofdingType.HaefeleIT,HoofdingType.Noteborn,HoofdingType.SFS,HoofdingType.VanRaemdonck, HoofdingType.CampeTonny,HoofdingType.OPO)
 	
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHeinNaarEindklant()) {
 		Set HeeftEigenHoofding =  HeeftEigenHoofding || (AfzenderHoofdingDto.HeaderType = HoofdingType.Hein)
Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 65150)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 67229)
@@ -156,6 +156,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HaefeleNOPersonality)
+	
+	Do ..ValideerKlantId(..KlantDataDto.ID, HaefeleNOPersonality)
+	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/common/impl/GebruikerAPIimpl.cls.xml
===================================================================
diff -u -r65150 -r67229
--- DOM/common/impl/GebruikerAPIimpl.cls.xml	(.../GebruikerAPIimpl.cls.xml)	(revision 65150)
+++ DOM/common/impl/GebruikerAPIimpl.cls.xml	(.../GebruikerAPIimpl.cls.xml)	(revision 67229)
@@ -168,6 +168,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyGebruiker()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInDummyGebruiker()
Index: vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r66343 -r67229
--- vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 66343)
+++ vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 67229)
@@ -19,6 +19,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleAT">
 <FormalSpec>HaefeleATPersonality:DOM.common.HaefeleATPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml
===================================================================
diff -u -r65150 -r67229
--- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml	(.../KlantRapporteurVhisie3.cls.xml)	(revision 65150)
+++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml	(.../KlantRapporteurVhisie3.cls.xml)	(revision 67229)
@@ -117,6 +117,10 @@
 <FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
 </Method>
Index: BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml
===================================================================
diff -u -r65150 -r67229
--- BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 65150)
+++ BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 67229)
@@ -36,6 +36,8 @@
 		Do ..VerwerkHaefeleIT()
 	} ElseIf HoofdingType = "HAEFELENL" {
 		Do ..VerwerkHaefeleNL()
+	} ElseIf HoofdingType = "HAEFELENO" {
+		Do ..VerwerkHaefeleNO()
 	} ElseIf HoofdingType = "HAEFELESE" {
 		Do ..VerwerkHaefeleSE()
 	} ElseIf HoofdingType = "HALUX" {
@@ -131,6 +133,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 65150)
+++ vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 67229)
@@ -87,6 +87,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNO",HaefeleNOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
Index: vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml
===================================================================
diff -u -r65150 -r67229
--- vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml	(.../TestGeefKlantInstellingenService.cls.xml)	(revision 65150)
+++ vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml	(.../TestGeefKlantInstellingenService.cls.xml)	(revision 67229)
@@ -67,6 +67,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestPersonalityHaefeleNO">
+<Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality = ##class(DOM.common.HaefeleNOPersonality).Instance()
+	#dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.EC.impl.ECommerceAPI).%New().GeefKlantInstellingenService(Personality)
+	Do $$$AssertContains(KlantInstellingenService.%ClassName(1),"HaefeleNO")
+]]></Implementation>
+</Method>
+
 <Method name="TestPersonalityHaefeleIT">
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality = ##class(DOM.common.HaefeleITPersonality).Instance()
Index: BL/FOP/Proxy/enu/HoofdingType.cls.xml
===================================================================
diff -u -r65150 -r67229
--- BL/FOP/Proxy/enu/HoofdingType.cls.xml	(.../HoofdingType.cls.xml)	(revision 65150)
+++ BL/FOP/Proxy/enu/HoofdingType.cls.xml	(.../HoofdingType.cls.xml)	(revision 67229)
@@ -100,6 +100,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleNO">
+<ClassMethod>1</ClassMethod>
+<ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
+<Implementation><![CDATA[	Quit "HAEFELENO"
+]]></Implementation>
+</Method>
+
 <Method name="HaefeleBE">
 <ClassMethod>1</ClassMethod>
 <ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml
===================================================================
diff -u -r66984 -r67229
--- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 66984)
+++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 67229)
@@ -92,6 +92,8 @@
 		Do ..VerwerkHaefeleSE(##class(DOM.common.HaefeleCHPersonality).Instance()) // De LeverbonHoofding mag voor klant dezelfde zijn als i.g.v. multipersonality.
 	} ElseIf ..IsHaefeleFI(KLNr) {
 		Do ..VerwerkHaefeleFI(##class(DOM.common.HaefeleCHPersonality).Instance()) // De LeverbonHoofding mag voor klant dezelfde zijn als i.g.v. multipersonality.
+	} ElseIf ..IsHaefeleNO(KLNr) {
+		Do ..VerwerkHaefeleNO(##class(DOM.common.HaefeleNOPersonality).Instance()) // De LeverbonHoofding mag voor klant dezelfde zijn als i.g.v. multipersonality.
 	} Else {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Voor KLNr '"_KLNr_"' is er nog geen eigen LeverbonHoofding voorzien i.g.v. niet-multipersonality. "))
 	}
@@ -202,6 +204,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsHaefeleNO">
+<FormalSpec>KLNr:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (KLNr = 36413)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[
@@ -602,6 +612,34 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleNO">
+<FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleNO()
+	
+	Set ..LeverbonHoofding.ColLeftWidth = "40mm"
+    Set ..LeverbonHoofding.ColRightWidth = "73mm"
+    
+	#dim URL As %String = ""
+	
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(HaefeleNOPersonality.GeefKlantID())
+	If Klant.HeeftEigenLogo(){
+    	Set URL = "\\fop\Resources\Media\KlantLogos\"
+		#dim Bestand As %String = Klant.GeefLogo()
+		#dim Extensie As %String = ##class(TECH.StringUtils).GetLastPart(Bestand,".")
+    	Set URL = ##class(TECH.Files).AppendFile(URL,Bestand)
+    	Set ..LeverbonHoofding.LOGO = ##class(BL.FOP.Basis.pxAttribType).Create(URL,##class(TECH.StringUtils).ToUpper(Extensie),,)
+	}
+    Set ..LeverbonHoofding.NAAM = "Häfele GmbH & Co KG"
+    Set ..LeverbonHoofding.STRAATNRBUS = "Adolf-Häfele-Str. 1"    
+    Set ..LeverbonHoofding.WOONPLAATS = "Nagold"
+    Set ..LeverbonHoofding.POSTCODE = "72202"
+	Set ..LeverbonHoofding.TELEFOON = "+49 745 29 50"	
+	Set ..LeverbonHoofding.EMAIL = "Info@hafele.de"
+	Set ..LeverbonHoofding.T1 = "USt-ID: DE144425382"
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/impl/KlantInstellingenServiceHaefeleNO.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/KlantInstellingenServiceHaefeleNO.cls.xml	(revision 0)
+++ APPS/EC/impl/KlantInstellingenServiceHaefeleNO.cls.xml	(revision 67229)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.KlantInstellingenServiceHaefeleNO">
+<Super>APPS.common.impl.KlantInstellingenService</Super>
+
+<Method name="MagKlantLBXVerpakkingTypeBestellen">
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.LBXVerpakkingType</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (VerpakkingType '= ##class(DOM.PM.enu.LBXVerpakkingType).VHoss())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt
===================================================================
diff -u -r65150 -r67229
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 65150)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 67229)
@@ -141,6 +141,7 @@
                     <s:enumeration value="42"/>
                     <s:enumeration value="43"/>
                     <s:enumeration value="44"/>
+                    <s:enumeration value="45"/>
                 </s:restriction>
             </s:simpleType>
             <s:complexType name="WebshopSessieSettings">