Index: DOM/common/enu/Personality.cls.xml
===================================================================
diff -u -r64263 -r64404
--- DOM/common/enu/Personality.cls.xml	(.../Personality.cls.xml)	(revision 64263)
+++ DOM/common/enu/Personality.cls.xml	(.../Personality.cls.xml)	(revision 64404)
@@ -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</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</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</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</Default>
 </Parameter>
 
 <Method name="VanHoecke">
@@ -298,6 +298,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="OPO">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit 41
+]]></Implementation>
+</Method>
+
 <Method name="RandomValue">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ValueToBeIgnored...:TECH.String</FormalSpec>
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_OPO.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_OPO.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_OPO.txt	(revision 64404)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>82.12</AankoopPrijs>
+  <VerkoopPrijs>164.24</VerkoopPrijs>
+  <LijstPrijs>127.51</LijstPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: DOM/common/PersonalityVisitor.cls.xml
===================================================================
diff -u -r64263 -r64404
--- DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 64263)
+++ DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 64404)
@@ -188,6 +188,11 @@
 <Abstract>1</Abstract>
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 </Method>
+
+<Method name="VerwerkOPO">
+<Abstract>1</Abstract>
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+</Method>
 </Class>
 
 
Index: DOM/common/impl/PersonalityService.cls.xml
===================================================================
diff -u -r64265 -r64404
--- DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 64265)
+++ DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 64404)
@@ -153,6 +153,7 @@
 	Quit:(PersonalityID = Personality.HaefeleAT) $$$True
 
 	Quit:(PersonalityID = Personality.SFS) $$$True
+	Quit:(PersonalityID = Personality.OPO) $$$True
 	Quit:(PersonalityID = Personality.Kisch) $$$True
 	Quit $$$False
 ]]></Implementation>
Index: DOM/VKP/impl/OPOKlantData.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/OPOKlantData.cls.xml	(revision 0)
+++ DOM/VKP/impl/OPOKlantData.cls.xml	(revision 64404)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.impl.OPOKlantData">
+<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/GeefVerkoopprijsBerekenaar/Test.cls.xml
===================================================================
diff -u -r64263 -r64404
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 64263)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 64404)
@@ -80,6 +80,7 @@
 	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).OPO())
 
 	Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein())
 	Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder())
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_OPO.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_OPO.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_OPO.txt	(revision 64404)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>46.01</AankoopPrijs>
+  <VerkoopPrijs>92.02</VerkoopPrijs>
+  <LijstPrijs>57.51</LijstPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml
===================================================================
diff -u -r64263 -r64404
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64263)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64404)
@@ -77,8 +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).OPO())
 	
-	
 	Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein())
 	Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Seefelder())
 	Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Zweygart())
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r64263 -r64404
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64263)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64404)
@@ -178,6 +178,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkOPO",OPOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkPavanello">
 <FormalSpec>PavanelloPersonality:DOM.common.PavanelloPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkPavanello",PavanelloPersonality)
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/OPOPrijsFactorBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/OPOPrijsFactorBepaler.cls.xml	(revision 0)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/OPOPrijsFactorBepaler.cls.xml	(revision 64404)
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.OPOPrijsFactorBepaler">
+<Super>APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler,DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerkenVisitor</Super>
+
+<Parameter name="LadeMetGeleiders">
+<Type>%Decimal</Type>
+<Default>2.0</Default>
+</Parameter>
+
+<Parameter name="LadeZonderGeleiders">
+<Type>%Decimal</Type>
+<Default>1.8</Default>
+</Parameter>
+
+<Parameter name="ValutaFactor">
+<Type>%Decimal</Type>
+<Default>1.12</Default>
+</Parameter>
+
+<Parameter name="Orgalux">
+<Type>%Decimal</Type>
+<Default>2.25</Default>
+</Parameter>
+
+<Property name="ActieDefinitieRepository">
+<Type>DOM.EC.Winkelkar.Actie.MaatwerkActieDefinitieObjectRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PrijsFactor">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="MaatwerkLijn">
+<Type>DOM.EC.Winkelkar.MaatwerkLijn</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ActieDefinitieRepository:DOM.EC.Winkelkar.Actie.MaatwerkActieDefinitieObjectRepository</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ActieDefinitieRepository = $$$Implementation(ActieDefinitieRepository,##class(DOM.EC.Winkelkar.Actie.impl.MaatwerkActieDefinitieObjectRepository).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrijsFactor">
+<FormalSpec>MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn</FormalSpec>
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	set ..PrijsFactor = 1
+	
+	set ..MaatwerkLijn = MaatwerkLijn
+	Do MaatwerkLijn.GeefIngegevenKenmerken().Accept($this)
+	do:(MaatwerkLijn.GeefActies().Count()) ..OverridePrijsFactor()
+
+	Quit ..PrijsFactor
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrgaluxPrijsFactor">
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = ..#Orgalux
+
+	Quit ..PrijsFactor
+]]></Implementation>
+</Method>
+
+<Method name="OverridePrijsFactor">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Override As %Numeric = 0
+	set ActieIterator = ##class(TECH.ListIterator).%New(..MaatwerkLijn.GeefActies())
+	while ( ActieIterator.HasNext() && ( Override = 0) ) {
+		#dim ActieDef As DOM.EC.Winkelkar.Actie.dto.MaatwerkActieDefinitie = ..ActieDefinitieRepository.GetByID(ActieIterator.Next().ID)
+		set Override = ActieDef.PrijsFactorOverride
+	}
+	set:(Override>0) ..PrijsFactor = Override
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTAORKenmerken">
+<FormalSpec>TAORKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken</FormalSpec>
+<Implementation><![CDATA[
+	If ..IsLadeInclusiefGeleiders(TAORKenmerken,##class(DOM.PM.Maatwerk.Calc.HF.enu.TAORRol).Glijder()){
+		Set ..PrijsFactor = ..#LadeMetGeleiders
+	}Else{
+		Set ..PrijsFactor = ..#LadeZonderGeleiders
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkLBXKenmerken">
+<FormalSpec>LBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken</FormalSpec>
+<Implementation><![CDATA[
+	If ..IsLadeInclusiefGeleiders(LBXKenmerken,##class(DOM.PM.Maatwerk.Calc.HF.enu.LBXRol).Geleider()){
+		Set ..PrijsFactor = ..#LadeMetGeleiders
+	}Else{
+		Set ..PrijsFactor = ..#LadeZonderGeleiders	
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTBXKenmerken">
+<FormalSpec>TBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken</FormalSpec>
+<Implementation><![CDATA[
+	#dim IsTbxLadeInclusiefGeleiders = $$$Not(TBXKenmerken.NietMeeleveren.Find(##class(DOM.PM.Maatwerk.Calc.HF.enu.TBXRol).CorpusProfiel()))
+	If IsTbxLadeInclusiefGeleiders {
+		Set ..PrijsFactor = ..#LadeMetGeleiders
+	}Else{
+		Set ..PrijsFactor = ..#LadeZonderGeleiders	
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsLadeInclusiefGeleiders">
+<FormalSpec>IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,Rol:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim DummyAantal As %Integer = 1	
+	#dim OPOKlantID As DOM.VKP.VanHoeckeKlantID = ##class(DOM.VKP.enu.Klant).OPO()
+	#dim VanHoeckePersonality As DOM.common.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
+
+	#dim MaatwerkCalcAPI As DOM.PM.MaatwerkCalcAPI = ##class(DOM.DomeinContext).Instance().GeefMaatwerkCalcAPI()
+	#dim HalffabItemsBoom As DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom = MaatwerkCalcAPI.GeefHalffabItemsBoom(IngegevenKenmerken,DummyAantal,OPOKlantID,VanHoeckePersonality)
+	#dim Item As DOM.PM.Maatwerk.Calc.HF.IHalffabItem = HalffabItemsBoom.GeefHalffabItem(Rol)
+	
+	Quit (##class(DOM.PM.Maatwerk.Calc.HF.HalffabItemUtils).GeefAantalProductenOpgenomenInEindproduct(Item) > 0)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml
===================================================================
diff -u -r64263 -r64404
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64263)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 64404)
@@ -79,6 +79,7 @@
 	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).OPO())
 	
 	Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein())
 	Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder())
Index: DOM/common/PersonalityUnishopVisitor.cls.xml
===================================================================
diff -u -r64263 -r64404
--- DOM/common/PersonalityUnishopVisitor.cls.xml	(.../PersonalityUnishopVisitor.cls.xml)	(revision 64263)
+++ DOM/common/PersonalityUnishopVisitor.cls.xml	(.../PersonalityUnishopVisitor.cls.xml)	(revision 64404)
@@ -8,6 +8,10 @@
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 </Method>
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r64263 -r64404
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64263)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64404)
@@ -109,6 +109,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim LeverancierData As DOM.common.LeverancierPersonalityData = OPOPersonality.GeefLeverancierData()
+	Set ..AankoopPrijs = ..GeefAankoopPrijsBijPersonalityLeverancierInclusiefKorting(..PersonalityRepo.GeefViaID(LeverancierData.PersonalityId),LeverancierData.EigenKlantId)
+	Set ..VerkoopPrijs = ..GeefVerkoopPrijsOBVPersonalityAankoopPrijs(OPOPersonality,..Winkelkar.GeefKlantID())
+	Set ..LijstPrijs = ..GeefEchteLijstPrijs()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml
===================================================================
diff -u -r64263 -r64404
--- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 64263)
+++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 64404)
@@ -26,6 +26,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkAnderePersonality(OPOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkAnderePersonality(HaefeleBEPersonality)
Index: vhUnitTest/DOM/common/impl/PersonalityService/MagOrgaluxVerkopen/Test.cls.xml
===================================================================
diff -u -r64265 -r64404
--- vhUnitTest/DOM/common/impl/PersonalityService/MagOrgaluxVerkopen/Test.cls.xml	(.../Test.cls.xml)	(revision 64265)
+++ vhUnitTest/DOM/common/impl/PersonalityService/MagOrgaluxVerkopen/Test.cls.xml	(.../Test.cls.xml)	(revision 64404)
@@ -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.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,,Personality.HaefeleAT,Personality.HaefeleIT,Personality.HaefeleNL,Personality.Kisch) {
+		if ##class(TECH.StringUtils).Equals(PersonalityID,Personality.SFS,Personality.OPO,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,,Personality.HaefeleAT,Personality.HaefeleIT,Personality.HaefeleNL,Personality.Kisch) {
 			Do $$$AssertTrue(Service.MagOrgaluxVerkopen(PersonalityID))
 		} else {
 			Do $$$AssertFalse(Service.MagOrgaluxVerkopen(PersonalityID))
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r64263 -r64404
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64263)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64404)
@@ -43,6 +43,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkBeslagteknikk">
 <FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml
===================================================================
diff -u -r64265 -r64404
--- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 64265)
+++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 64404)
@@ -36,7 +36,7 @@
 		#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){
 			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.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) {
+		} 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")
 		} else {
 			do ..Fail("Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Niet getest")
@@ -63,7 +63,7 @@
 		#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){
 			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.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) {
+		} 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")
 		} else {
 			do ..Fail("Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Niet getest")
Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_OPO.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_OPO.txt	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_OPO.txt	(revision 64404)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PrijsBerekeningPrijzen>
+  <AankoopPrijs>44.07</AankoopPrijs>
+  <VerkoopPrijs>88.14</VerkoopPrijs>
+  <LijstPrijs>68.42</LijstPrijs>
+</PrijsBerekeningPrijzen>
\ No newline at end of file
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r64263 -r64404
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64263)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 64404)
@@ -33,6 +33,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFI">
 <FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r64263 -r64404
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64263)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64404)
@@ -22,6 +22,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactorBepaler = ##class(APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.OPOPrijsFactorBepaler).%New()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDaro">
 <FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..PrijsFactorBepaler = ##class(APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.DaroPrijsFactorBepaler).%New()
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r64263 -r64404
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64263)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 64404)
@@ -171,6 +171,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkOPO",OPOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkPavanello">
 <FormalSpec>PavanelloPersonality:DOM.common.PavanelloPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkPavanello",PavanelloPersonality)
Index: DOM/common/enu/Personality/Verwerker.cls.xml
===================================================================
diff -u -r64263 -r64404
--- DOM/common/enu/Personality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64263)
+++ DOM/common/enu/Personality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64404)
@@ -68,6 +68,8 @@
 		Do ..VerwerkLayer()
 	} ElseIf Personality = "9" {
 		Do ..VerwerkNoteborn()
+	} ElseIf Personality = "41" {
+		Do ..VerwerkOPO()
 	} ElseIf Personality = "18" {
 		Do ..VerwerkPavanello()
 	} ElseIf Personality = "31" {
@@ -263,6 +265,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkPavanello">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml
===================================================================
diff -u -r64263 -r64404
--- APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 64263)
+++ APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 64404)
@@ -112,6 +112,12 @@
 <Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Hein()
 ]]></Implementation>
 </Method>
+
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).OPO()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhDeploy/Deploy20210422xOPOPersonalityAanmaken.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20210422xOPOPersonalityAanmaken.cls.xml	(revision 0)
+++ vhDeploy/Deploy20210422xOPOPersonalityAanmaken.cls.xml	(revision 64404)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20210422xOPOPersonalityAanmaken">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="PersonalityID">
+<Type>%String</Type>
+<Default>41</Default>
+</Parameter>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Aanmaken van Personality voor OPO (ID=41)</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Do ##class(DOM.common.impl.PersonalityCreator).%New().StelInNieuwePersonality(	..#PersonalityID, 
+																					##class(DOM.common.OPOPersonality).%ClassName($$$True), 
+																					##class(DOM.VKP.enu.Klant).OPO()	
+																				 )
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt
===================================================================
diff -u -r64267 -r64404
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 64267)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 64404)
@@ -137,6 +137,7 @@
                     <s:enumeration value="38"/>
                     <s:enumeration value="39"/>
                     <s:enumeration value="40"/>
+                    <s:enumeration value="41"/>
                 </s:restriction>
             </s:simpleType>
             <s:complexType name="WebshopSessieSettings">
Index: DOM/common/OPOPersonality.cls.xml
===================================================================
diff -u
--- DOM/common/OPOPersonality.cls.xml	(revision 0)
+++ DOM/common/OPOPersonality.cls.xml	(revision 64404)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.common.OPOPersonality">
+<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).OPO())
+]]></Implementation>
+</Method>
+
+<Method name="GeefTaal">
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.enu.Taal).Duits()
+]]></Implementation>
+</Method>
+
+<Method name="Accept">
+<FormalSpec>Visitor:DOM.common.PersonalityVisitor</FormalSpec>
+<Implementation><![CDATA[	do Visitor.VerwerkOPO($this)
+]]></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).OPO())
+]]></Implementation>
+</Method>
+
+<Method name="IsHandel">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit 1
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "OPO Oeschger"
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrefix">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "OPO_"
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: DOM/common/enu/Personality/AutoComplete.cls.xml
===================================================================
diff -u -r64263 -r64404
--- DOM/common/enu/Personality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64263)
+++ DOM/common/enu/Personality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64404)
@@ -205,6 +205,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="OPO">
+<Type>%String</Type>
+<InitialExpression>"41"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="Pavanello">
 <Type>%String</Type>
 <InitialExpression>"18"</InitialExpression>