Index: DOM/VKP/impl/HaefeleFRKlantData.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/HaefeleFRKlantData.cls.xml	(revision 0)
+++ DOM/VKP/impl/HaefeleFRKlantData.cls.xml	(revision 64675)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.impl.HaefeleFRKlantData">
+<Super>DOM.VKP.impl.HandelKlantData</Super>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+<Package name="DOM.VKP.impl" sqlname="DOM_VKP_impl"/>
+</Export>
Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml
===================================================================
diff -u -r64404 -r64675
--- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 64404)
+++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 64675)
@@ -74,6 +74,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFR">
+<FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkAnderePersonality(HaefeleFRPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleDK">
+<FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkAnderePersonality(HaefeleDKPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkAnderePersonality(DestilPersonality)
Index: vhUnitTest/DOM/common/impl/PersonalityService/MagOrgaluxVerkopen/Test.cls.xml
===================================================================
diff -u -r64626 -r64675
--- vhUnitTest/DOM/common/impl/PersonalityService/MagOrgaluxVerkopen/Test.cls.xml	(.../Test.cls.xml)	(revision 64626)
+++ vhUnitTest/DOM/common/impl/PersonalityService/MagOrgaluxVerkopen/Test.cls.xml	(.../Test.cls.xml)	(revision 64675)
@@ -11,7 +11,7 @@
 	#dim PersonalityIterator as TECH.Iterator = ##class(DOM.common.enu.Personality).ValueListIterator()
 	While PersonalityIterator.HasNext(){
 		#dim PersonalityID as %String = PersonalityIterator.Next()
-		if ##class(TECH.StringUtils).Equals(PersonalityID,Personality.SFS,Personality.OPO,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,,Personality.HaefeleAT,Personality.HaefeleIT,Personality.HaefeleNL,Personality.Kisch,Personality.HaefeleBE,Personality.Dupont,Personality.Daro) {
+		if ##class(TECH.StringUtils).Equals(PersonalityID,Personality.SFS,Personality.OPO,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,,Personality.HaefeleAT,Personality.HaefeleIT,Personality.HaefeleNL,Personality.Kisch,Personality.HaefeleBE,Personality.Dupont,Personality.Daro,Personality.HaefeleFR,Personality.HaefeleDK) {
 			Do $$$AssertTrue(Service.MagOrgaluxVerkopen(PersonalityID))
 		} else {
 			Do $$$AssertFalse(Service.MagOrgaluxVerkopen(PersonalityID))
Index: DOM/common/PersonalityVisitor.cls.xml
===================================================================
diff -u -r64404 -r64675
--- DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 64404)
+++ DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 64675)
@@ -54,6 +54,16 @@
 <FormalSpec>HaefeleATPersonality:DOM.common.HaefeleATPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleFR">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleDK">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkDestil">
 <Abstract>1</Abstract>
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r64404 -r64675
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64404)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64675)
@@ -184,6 +184,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFR">
+<FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim LeverancierData As DOM.common.LeverancierPersonalityData = HaefeleFRPersonality.GeefLeverancierData()
+	Set ..AankoopPrijs = ..GeefAankoopPrijsBijPersonalityLeverancierInclusiefKorting(..PersonalityRepo.GeefViaID(LeverancierData.PersonalityId),LeverancierData.EigenKlantId)
+	Set ..VerkoopPrijs = ..GeefVerkoopPrijsOBVPersonalityAankoopPrijs(HaefeleFRPersonality,..Winkelkar.GeefKlantID())
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleDK">
+<FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim LeverancierData As DOM.common.LeverancierPersonalityData = HaefeleDKPersonality.GeefLeverancierData()
+	Set ..AankoopPrijs = ..GeefAankoopPrijsBijPersonalityLeverancierInclusiefKorting(..PersonalityRepo.GeefViaID(LeverancierData.PersonalityId),LeverancierData.EigenKlantId)
+	Set ..VerkoopPrijs = ..GeefVerkoopPrijsOBVPersonalityAankoopPrijs(HaefeleDKPersonality,..Winkelkar.GeefKlantID())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_HaefeleDK.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_HaefeleDK.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_HaefeleDK.txt	(revision 64675)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>136.84</AankoopPrijs>
+  <VerkoopPrijs>232.628</VerkoopPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: APPS/EC/impl/KlantInstellingenServiceHaefeleDK.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/KlantInstellingenServiceHaefeleDK.cls.xml	(revision 0)
+++ APPS/EC/impl/KlantInstellingenServiceHaefeleDK.cls.xml	(revision 64675)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.KlantInstellingenServiceHaefeleDK">
+<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: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r64404 -r64675
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64404)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64675)
@@ -118,12 +118,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDK">
+<FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDK",HaefeleDKPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFI">
 <FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFR">
+<FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFR",HaefeleFRPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleIT">
 <FormalSpec>HaefeleITPersonality:DOM.common.HaefeleITPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleIT",HaefeleITPersonality)
Index: vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml
===================================================================
diff -u -r64405 -r64675
--- vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml	(.../TestGeefKlantInstellingenService.cls.xml)	(revision 64405)
+++ vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml	(.../TestGeefKlantInstellingenService.cls.xml)	(revision 64675)
@@ -83,6 +83,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestPersonalityHaefeleFR">
+<Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality = ##class(DOM.common.HaefeleFRPersonality).Instance()
+	#dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.EC.impl.ECommerceAPI).%New().GeefKlantInstellingenService(Personality)
+	Do $$$AssertContains(KlantInstellingenService.%ClassName(1),"HaefeleFR")
+]]></Implementation>
+</Method>
+
+<Method name="TestPersonalityHaefeleDK">
+<Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality = ##class(DOM.common.HaefeleDKPersonality).Instance()
+	#dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.EC.impl.ECommerceAPI).%New().GeefKlantInstellingenService(Personality)
+	Do $$$AssertContains(KlantInstellingenService.%ClassName(1),"HaefeleDK")
+]]></Implementation>
+</Method>
+
 <Method name="TestPersonalityVanHoecke">
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
Index: DOM/common/impl/PersonalityService.cls.xml
===================================================================
diff -u -r64626 -r64675
--- DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 64626)
+++ DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 64675)
@@ -112,6 +112,8 @@
 	Quit:(PersonalityID = Personality.HaefeleFI) $$$True
 	Quit:(PersonalityID = Personality.HaefeleIT) $$$True
 	Quit:(PersonalityID = Personality.HaefeleAT) $$$True
+	Quit:(PersonalityID = Personality.HaefeleFR) $$$True
+	Quit:(PersonalityID = Personality.HaefeleDK) $$$True
 	Quit:(PersonalityID = Personality.Zweygart) $$$True
 	Quit:(PersonalityID = Personality.JBarth) $$$True
 	Quit:(PersonalityID = Personality.Kleiner) $$$True
@@ -152,6 +154,8 @@
 	Quit:(PersonalityID = Personality.HaefeleBE) $$$True
 	Quit:(PersonalityID = Personality.HaefeleIT) $$$True
 	Quit:(PersonalityID = Personality.HaefeleAT) $$$True
+	Quit:(PersonalityID = Personality.HaefeleFR) $$$True
+	Quit:(PersonalityID = Personality.HaefeleDK) $$$True
 
 	Quit:(PersonalityID = Personality.SFS) $$$True
 	Quit:(PersonalityID = Personality.OPO) $$$True
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_HaefeleDK.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_HaefeleDK.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_HaefeleDK.txt	(revision 64675)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>255.02</AankoopPrijs>
+  <VerkoopPrijs>395.281</VerkoopPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_HaefeleFR.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_HaefeleFR.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_HaefeleFR.txt	(revision 64675)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>255.02</AankoopPrijs>
+  <VerkoopPrijs>395.281</VerkoopPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml
===================================================================
diff -u -r64404 -r64675
--- APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 64404)
+++ APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 64675)
@@ -77,6 +77,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFR">
+<FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFrankrijk()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleDK">
+<FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleDenemarken()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Destil()
Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml
===================================================================
diff -u -r64404 -r64675
--- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 64404)
+++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 64675)
@@ -34,7 +34,7 @@
 
 	while PersonalityIterator.HasNext() {
 		#dim PersonalityId as %String = PersonalityIterator.Next()
-		if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleAT,..Personality.HaefeleIT){
+		if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleFR,..Personality.HaefeleDK){
 			Do $$$AssertTrue(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout")
 		} ElseIf ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.VanHoecke,..Personality.VanHoeckeVoorHalux,..Personality.SFS,..Personality.OPO,..Personality.Kisch,..Personality.Destil,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Noteborn,..Personality.Daro,..Personality.BeslagDesign,..Personality.Demo,..Personality.Galimberti,..Personality.Pavanello,..Personality.Ferexpert,..Personality.Beslagteknikk,..Personality.YachtSupplier,..Personality.DeceuninckDeforce,..Personality.Pierard,..Personality.HahleOy,..Personality.BiemarBois,..Personality.CampeTonny, ..Personality.Dupont) {
 			Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout")
@@ -61,7 +61,7 @@
 
 	while PersonalityIterator.HasNext() {
 		#dim PersonalityId as %String = PersonalityIterator.Next()
-		if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer, ..Personality.Dupont,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Pavanello,..Personality.Ferexpert,,..Personality.HaefeleAT,..Personality.HaefeleIT){
+		if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer, ..Personality.Dupont,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Pavanello,..Personality.Ferexpert,,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleDK,..Personality.HaefeleFR){
 			Do $$$AssertTrue(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout")
 		} ElseIf ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.VanHoecke,..Personality.VanHoeckeVoorHalux,..Personality.SFS,..Personality.OPO,..Personality.Kisch,..Personality.Destil,..Personality.Noteborn,..Personality.Daro,..Personality.BeslagDesign,..Personality.Demo,..Personality.Galimberti,..Personality.Beslagteknikk,..Personality.YachtSupplier,..Personality.DeceuninckDeforce,..Personality.Pierard,..Personality.HahleOy,..Personality.BiemarBois,..Personality.CampeTonny) {
 			Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout")
Index: DOM/common/enu/Personality.cls.xml
===================================================================
diff -u -r64404 -r64675
--- DOM/common/enu/Personality.cls.xml	(.../Personality.cls.xml)	(revision 64404)
+++ DOM/common/enu/Personality.cls.xml	(.../Personality.cls.xml)	(revision 64675)
@@ -6,11 +6,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="DISPLAYLIST">
-<Default>,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo,Zweygart,Galimberti,Pavanello,Ferexpert,Beslagteknikk,BiemarBois,CampeTonny,Rini,Furnifit,YachtSupplier,DSGroup,DeBisschop,DeceuninckDeforce,Pierard,JBarth,HaefeleDE,Kleiner,Layer,HahleOy,HaefeleSE,HaefeleFI,HaefeleIT,HaefeleAT,OPO</Default>
+<Default>,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo,Zweygart,Galimberti,Pavanello,Ferexpert,Beslagteknikk,BiemarBois,CampeTonny,Rini,Furnifit,YachtSupplier,DSGroup,DeBisschop,DeceuninckDeforce,Pierard,JBarth,HaefeleDE,Kleiner,Layer,HahleOy,HaefeleSE,HaefeleFI,HaefeleIT,HaefeleAT,OPO,HaefeleFR,HaefeleDK</Default>
 </Parameter>
 
 <Parameter name="VALUELIST">
-<Default>,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,29,30,31,32,33,34,35,36,37,38,39,40,41</Default>
+<Default>,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43</Default>
 </Parameter>
 
 <Method name="VanHoecke">
@@ -305,6 +305,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleFR">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit 42
+]]></Implementation>
+</Method>
+
+<Method name="HaefeleDK">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit 43
+]]></Implementation>
+</Method>
+
 <Method name="RandomValue">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ValueToBeIgnored...:TECH.String</FormalSpec>
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r64404 -r64675
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64404)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64675)
@@ -25,12 +25,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDK">
+<FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFI">
 <FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFR">
+<FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleIT">
 <FormalSpec>HaefeleITPersonality:DOM.common.HaefeleITPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r64404 -r64675
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64404)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64675)
@@ -27,6 +27,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDK">
+<FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFR">
+<FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleIT">
 <FormalSpec>HaefeleITPersonality:DOM.common.HaefeleITPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/common/HaefeleDKPersonality.cls.xml
===================================================================
diff -u
--- DOM/common/HaefeleDKPersonality.cls.xml	(revision 0)
+++ DOM/common/HaefeleDKPersonality.cls.xml	(revision 64675)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.common.HaefeleDKPersonality">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.common.impl.HandelPersonality</Super>
+
+<Method name="Instance">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.impl.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(DOM.common.enu.Personality).HaefeleDK())
+]]></Implementation>
+</Method>
+
+<Method name="Accept">
+<FormalSpec>Visitor:DOM.common.PersonalityVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.VerwerkHaefeleDK($this)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTaal">
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.enu.Taal).Deens()
+]]></Implementation>
+</Method>
+
+<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).HaefeleDenemarken())
+]]></Implementation>
+</Method>
+
+<Method name="IsHandel">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "Häfele DK"
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrefix">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "hfleDK_"
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_HaefeleFR.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_HaefeleFR.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_HaefeleFR.txt	(revision 64675)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>136.84</AankoopPrijs>
+  <VerkoopPrijs>232.628</VerkoopPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: APPS/EC/impl/ECommerceAPI.cls.xml
===================================================================
diff -u -r64405 -r64675
--- APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 64405)
+++ APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 64675)
@@ -152,6 +152,10 @@
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleIT).%New()
 	} ElseIf (Personality.GeefID() = ..Personality.HaefeleAT) {
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleAT).%New()
+	} ElseIf (Personality.GeefID() = ..Personality.HaefeleFR) {
+		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleFR).%New()
+	} ElseIf (Personality.GeefID() = ..Personality.HaefeleDK) {
+		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleDK).%New()
 	} Else {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Voor Personality '" _ $Select($IsObject(Personality):Personality.GeefID(),1:"[geen object]") _ "' bestaat geen KlantInstellingenService."))
 	}
Index: APPS/EC/impl/KlantInstellingenServiceHaefeleFR.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/KlantInstellingenServiceHaefeleFR.cls.xml	(revision 0)
+++ APPS/EC/impl/KlantInstellingenServiceHaefeleFR.cls.xml	(revision 64675)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.KlantInstellingenServiceHaefeleFR">
+<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: DOM/VKP/impl/HaefeleDKKlantData.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/HaefeleDKKlantData.cls.xml	(revision 0)
+++ DOM/VKP/impl/HaefeleDKKlantData.cls.xml	(revision 64675)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.impl.HaefeleDKKlantData">
+<Super>DOM.VKP.impl.HandelKlantData</Super>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+<Package name="DOM.VKP.impl" sqlname="DOM_VKP_impl"/>
+</Export>
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml
===================================================================
diff -u -r64404 -r64675
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64404)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64675)
@@ -79,6 +79,8 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleFI())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleIT())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleAT())
+	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleFR())
+	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleDK())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).OPO())
 	
 	Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein())
Index: vhDeploy/Deploy20210617xHaefeleFRPersonalityAanmaken.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20210617xHaefeleFRPersonalityAanmaken.cls.xml	(revision 0)
+++ vhDeploy/Deploy20210617xHaefeleFRPersonalityAanmaken.cls.xml	(revision 64675)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20210617xHaefeleFRPersonalityAanmaken">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="PersonalityID">
+<Type>%String</Type>
+<Default>42</Default>
+</Parameter>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Aanmaken van Personality voor Haefele FR (ID=42)</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Do ##class(DOM.common.impl.PersonalityCreator).%New().StelInNieuwePersonality(	..#PersonalityID, 
+																					##class(DOM.common.HaefeleFRPersonality).%ClassName($$$True), 
+																					##class(DOM.VKP.enu.Klant).HaefeleFrankrijk()		
+																				 )
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleDKPrijsFactorBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleDKPrijsFactorBepaler.cls.xml	(revision 0)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleDKPrijsFactorBepaler.cls.xml	(revision 64675)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HaefeleDKPrijsFactorBepaler">
+<Super>APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler,DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerkenVisitor</Super>
+
+<Parameter name="TBXLade">
+<Type>%Decimal</Type>
+<Default>1.57</Default>
+</Parameter>
+
+<Parameter name="LBXLade">
+<Type>%Decimal</Type>
+<Default>1.70</Default>
+</Parameter>
+
+<Parameter name="TAORLade">
+<Type>%Decimal</Type>
+<Default>1.55</Default>
+</Parameter>
+
+<Parameter name="Orgalux">
+<Type>%Decimal</Type>
+<Default>1.63</Default>
+</Parameter>
+
+<Property name="PrijsFactor">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrijsFactor">
+<FormalSpec>MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn</FormalSpec>
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = 1
+	Do MaatwerkLijn.GeefIngegevenKenmerken().Accept($this)
+	
+	Quit ..PrijsFactor
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrgaluxPrijsFactor">
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = ..#Orgalux
+	
+	Quit ..PrijsFactor
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTAORKenmerken">
+<FormalSpec>TAORKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#TAORLade
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkLBXKenmerken">
+<FormalSpec>LBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#LBXLade
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTBXKenmerken">
+<FormalSpec>TBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#TBXLade
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/common/enu/Personality/AutoComplete.cls.xml
===================================================================
diff -u -r64404 -r64675
--- DOM/common/enu/Personality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64404)
+++ DOM/common/enu/Personality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64675)
@@ -128,13 +128,27 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleDK">
+<Type>%String</Type>
+<InitialExpression>"43"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleFI">
 <Type>%String</Type>
 <InitialExpression>"38"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleFR">
+<Type>%String</Type>
+<InitialExpression>"42"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleIT">
 <Type>%String</Type>
 <InitialExpression>"39"</InitialExpression>
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml
===================================================================
diff -u -r64404 -r64675
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 64404)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 64675)
@@ -80,6 +80,8 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleFI())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleIT())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleAT())
+	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleFR())
+	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleDK())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).OPO())
 
 	Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein())
Index: vhDeploy/Deploy20210617xHaefeleDKPersonalityAanmaken.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20210617xHaefeleDKPersonalityAanmaken.cls.xml	(revision 0)
+++ vhDeploy/Deploy20210617xHaefeleDKPersonalityAanmaken.cls.xml	(revision 64675)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20210617xHaefeleDKPersonalityAanmaken">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="PersonalityID">
+<Type>%String</Type>
+<Default>43</Default>
+</Parameter>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Aanmaken van Personality voor Haefele DK (ID=43)</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Do ##class(DOM.common.impl.PersonalityCreator).%New().StelInNieuwePersonality(	..#PersonalityID, 
+																					##class(DOM.common.HaefeleDKPersonality).%ClassName($$$True), 
+																					##class(DOM.VKP.enu.Klant).HaefeleDenemarken()
+																				 )
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_HaefeleFR.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_HaefeleFR.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_HaefeleFR.txt	(revision 64675)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>115.02</AankoopPrijs>
+  <VerkoopPrijs>180.5814</VerkoopPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: DOM/common/HaefeleFRPersonality.cls.xml
===================================================================
diff -u
--- DOM/common/HaefeleFRPersonality.cls.xml	(revision 0)
+++ DOM/common/HaefeleFRPersonality.cls.xml	(revision 64675)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.common.HaefeleFRPersonality">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.common.impl.HandelPersonality</Super>
+
+<Method name="Instance">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.impl.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(DOM.common.enu.Personality).HaefeleFR())
+]]></Implementation>
+</Method>
+
+<Method name="Accept">
+<FormalSpec>Visitor:DOM.common.PersonalityVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.VerwerkHaefeleFR($this)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTaal">
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.enu.Taal).Frans()
+]]></Implementation>
+</Method>
+
+<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).HaefeleFrankrijk())
+]]></Implementation>
+</Method>
+
+<Method name="IsHandel">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "Häfele FR"
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrefix">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "hfleFR_"
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleFRPrijsFactorBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleFRPrijsFactorBepaler.cls.xml	(revision 0)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleFRPrijsFactorBepaler.cls.xml	(revision 64675)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HaefeleFRPrijsFactorBepaler">
+<Super>APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler,DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerkenVisitor</Super>
+
+<Parameter name="TBXLade">
+<Type>%Decimal</Type>
+<Default>1.57</Default>
+</Parameter>
+
+<Parameter name="LBXLade">
+<Type>%Decimal</Type>
+<Default>1.70</Default>
+</Parameter>
+
+<Parameter name="TAORLade">
+<Type>%Decimal</Type>
+<Default>1.55</Default>
+</Parameter>
+
+<Parameter name="Orgalux">
+<Type>%Decimal</Type>
+<Default>1.63</Default>
+</Parameter>
+
+<Property name="PrijsFactor">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrijsFactor">
+<FormalSpec>MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn</FormalSpec>
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = 1
+	Do MaatwerkLijn.GeefIngegevenKenmerken().Accept($this)
+	
+	Quit ..PrijsFactor
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrgaluxPrijsFactor">
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = ..#Orgalux
+	
+	Quit ..PrijsFactor
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTAORKenmerken">
+<FormalSpec>TAORKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#TAORLade
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkLBXKenmerken">
+<FormalSpec>LBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#LBXLade
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTBXKenmerken">
+<FormalSpec>TBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#TBXLade
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_HaefeleDK.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_HaefeleDK.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_HaefeleDK.txt	(revision 64675)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>115.02</AankoopPrijs>
+  <VerkoopPrijs>180.5814</VerkoopPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r64404 -r64675
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64404)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64675)
@@ -88,6 +88,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFR">
+<FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactorBepaler = ##class(APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HaefeleFRPrijsFactorBepaler).%New()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleDK">
+<FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactorBepaler = ##class(APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HaefeleDKPrijsFactorBepaler).%New()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInGeenPrijsFactorBepaler()
Index: DOM/common/PersonalityUnishopVisitor.cls.xml
===================================================================
diff -u -r64404 -r64675
--- DOM/common/PersonalityUnishopVisitor.cls.xml	(.../PersonalityUnishopVisitor.cls.xml)	(revision 64404)
+++ DOM/common/PersonalityUnishopVisitor.cls.xml	(.../PersonalityUnishopVisitor.cls.xml)	(revision 64675)
@@ -51,6 +51,16 @@
 <FormalSpec>HaefeleATPersonality:DOM.common.HaefeleATPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleFR">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleDK">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkDestil">
 <Abstract>1</Abstract>
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r64404 -r64675
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64404)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64675)
@@ -111,12 +111,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDK">
+<FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDK",HaefeleDKPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFI">
 <FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFR">
+<FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFR",HaefeleFRPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleIT">
 <FormalSpec>HaefeleITPersonality:DOM.common.HaefeleITPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleIT",HaefeleITPersonality)
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml
===================================================================
diff -u -r64404 -r64675
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64404)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64675)
@@ -77,6 +77,8 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleFI())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleIT())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleAT())
+	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleFR())
+	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleDK())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).OPO())
 	
 	Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein())
Index: DOM/common/enu/Personality/Verwerker.cls.xml
===================================================================
diff -u -r64404 -r64675
--- DOM/common/enu/Personality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64404)
+++ DOM/common/enu/Personality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64675)
@@ -46,8 +46,12 @@
 		Do ..VerwerkHaefeleBE()
 	} ElseIf Personality = "33" {
 		Do ..VerwerkHaefeleDE()
+	} ElseIf Personality = "43" {
+		Do ..VerwerkHaefeleDK()
 	} ElseIf Personality = "38" {
 		Do ..VerwerkHaefeleFI()
+	} ElseIf Personality = "42" {
+		Do ..VerwerkHaefeleFR()
 	} ElseIf Personality = "39" {
 		Do ..VerwerkHaefeleIT()
 	} ElseIf Personality = "12" {
@@ -199,12 +203,24 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDK">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFI">
 <Abstract>1</Abstract>
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFR">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleIT">
 <Abstract>1</Abstract>
 <Private>1</Private>