Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r67227 -r68635
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 67227)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 68635)
@@ -479,6 +479,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkMartens">
+<FormalSpec>MartensPersonality:DOM.common.MartensPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim LeverancierData As DOM.common.LeverancierPersonalityData = MartensPersonality.GeefLeverancierData()
+	Set ..AankoopPrijs = ..GeefAankoopPrijsBijPersonalityLeverancierInclusiefKorting(..PersonalityRepo.GeefViaID(LeverancierData.PersonalityId),LeverancierData.EigenKlantId)
+	Set ..VerkoopPrijs = ..GeefLijstPrijsInclKortingEnFactor(MartensPersonality,..Winkelkar.KlantID)
+	Set ..LijstPrijs = ..GeefEchteLijstPrijs()  * ..GeefPrijsFactorVoorPersonality(MartensPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="GeefAankoopPrijsBijPersonalityLeverancierInclusiefKorting">
 <Description>
 prijs die aan de handelsklant aangerekend wordt door leverancier (in principe vh aan klant personality, tenzij de Hein SubPersonalities)</Description>
Index: DOM/common/impl/PersonalityService.cls.xml
===================================================================
diff -u -r67227 -r68635
--- DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 67227)
+++ DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 68635)
@@ -125,6 +125,7 @@
 	Quit:(PersonalityID = Personality.Rini) $$$True
 	Quit:(PersonalityID = Personality.DeBisschop) $$$True
 	Quit:(PersonalityID = Personality.DSGroup) $$$True
+	Quit:(PersonalityID = Personality.Martens) $$$True
 	If ..ProjectSettingsAPI.IsActiefDuPontNaarEindklant() {
 		Quit:(PersonalityID = ##class(DOM.common.enu.Personality).Dupont()) $$$True
 	}
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r67227 -r68635
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 67227)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 68635)
@@ -195,6 +195,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkMartens">
+<FormalSpec>MartensPersonality:DOM.common.MartensPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkMartens",MartensPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkOPO">
 <FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkOPO",OPOPersonality)
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/MartensPrijsFactorBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/MartensPrijsFactorBepaler.cls.xml	(revision 0)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/MartensPrijsFactorBepaler.cls.xml	(revision 68635)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.MartensPrijsFactorBepaler">
+<Super>APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler,DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerkenVisitor</Super>
+
+<Parameter name="Factor">
+<Type>%Numeric</Type>
+<Default>1.33</Default>
+</Parameter>
+
+<Method name="GeefPrijsFactor">
+<FormalSpec>MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn</FormalSpec>
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[	Quit ..#Factor
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_Martens.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_Martens.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_Martens.txt	(revision 68635)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>327.79</AankoopPrijs>
+  <VerkoopPrijs>217.987</VerkoopPrijs>
+  <LijstPrijs>217.987</LijstPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r67227 -r68635
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 67227)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 68635)
@@ -57,6 +57,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkMartens">
+<FormalSpec>MartensPersonality:DOM.common.MartensPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkOPO">
 <FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt
===================================================================
diff -u -r67229 -r68635
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 67229)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 68635)
@@ -142,6 +142,7 @@
                     <s:enumeration value="43"/>
                     <s:enumeration value="44"/>
                     <s:enumeration value="45"/>
+                    <s:enumeration value="46"/>
                 </s:restriction>
             </s:simpleType>
             <s:complexType name="WebshopSessieSettings">
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r67227 -r68635
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 67227)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 68635)
@@ -261,6 +261,12 @@
 <Implementation><![CDATA[	Set ..PrijsFactorBepaler = ##class(APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HahleOyPrijsFactorBepaler).%New()
 ]]></Implementation>
 </Method>
+
+<Method name="VerwerkMartens">
+<FormalSpec>MartensPersonality:DOM.common.MartensPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactorBepaler = ##class(APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.MartensPrijsFactorBepaler).%New()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_Martens.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_Martens.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_Martens.txt	(revision 68635)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>162.92</AankoopPrijs>
+  <VerkoopPrijs>108.3418</VerkoopPrijs>
+  <LijstPrijs>108.3418</LijstPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_Martens.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_Martens.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_Martens.txt	(revision 68635)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>145.68</AankoopPrijs>
+  <VerkoopPrijs>96.8772</VerkoopPrijs>
+  <LijstPrijs>96.8772</LijstPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r67227 -r68635
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 67227)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 68635)
@@ -19,58 +19,55 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="VerwerkHaefeleAT">
-<FormalSpec>HaefeleATPersonality:DOM.common.HaefeleATPersonality</FormalSpec>
+<Method name="VerwerkMartens">
+<FormalSpec>MartensPersonality:DOM.common.MartensPersonality</FormalSpec>
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleAT">
+<FormalSpec>HaefeleATPersonality:DOM.common.HaefeleATPersonality</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleCH">
 <FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleFI">
 <FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleIT">
 <FormalSpec>HaefeleITPersonality:DOM.common.HaefeleITPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleNO">
 <FormalSpec>HaefeleNOPersonality:DOM.common.HaefeleNOPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkOPO">
 <FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkBeslagteknikk">
Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml
===================================================================
diff -u -r67227 -r68635
--- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 67227)
+++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 68635)
@@ -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,..Personality.HaefeleFR,..Personality.HaefeleDK,..Personality.HaefeleCH, ..Personality.HaefeleNO){
+		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,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens){
 			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,..Personality.HaefeleDK,..Personality.HaefeleFR,..Personality.HaefeleCH, ..Personality.HaefeleNO){
+		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,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens){
 			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: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r67227 -r68635
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 67227)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 68635)
@@ -202,6 +202,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkMartens">
+<FormalSpec>MartensPersonality:DOM.common.MartensPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkMartens",MartensPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkOPO">
 <FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkOPO",OPOPersonality)