Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 64269)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 64409)
@@ -76,6 +76,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, OPOPersonality)
+	
+	Do ..ValideerKlantId(..KlantDataDto.ID, OPOPersonality)
+	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: BL/FOP/Proxy/enu/HoofdingType.cls.xml
===================================================================
diff -u -r64269 -r64409
--- BL/FOP/Proxy/enu/HoofdingType.cls.xml	(.../HoofdingType.cls.xml)	(revision 64269)
+++ BL/FOP/Proxy/enu/HoofdingType.cls.xml	(.../HoofdingType.cls.xml)	(revision 64409)
@@ -114,6 +114,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="OPO">
+<ClassMethod>1</ClassMethod>
+<ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
+<Implementation><![CDATA[	Quit "OPO"
+]]></Implementation>
+</Method>
+
 <Method name="VanRaemdonck">
 <ClassMethod>1</ClassMethod>
 <ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
Index: APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 64269)
+++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 64409)
@@ -122,17 +122,19 @@
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[
-	If ..Offerte.IsBesteld() {
-		#dim Foutmelding As %String = "Order already confirmed"
-		#dim Exception As TECH.Exceptions.Exception = ##class(APPS.VKP.Offerte.impl.OfferteReedsBesteldException).%New(Foutmelding)
-		
-		Do ..Meldingen.Insert(Exception)
-	}
-	
+	Do ..ControleerReedsBesteld()
 	Do ..ControleerToegangEnPrijzen()
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ControleerReedsBesteld()
+	Do ..ControleerToegangEnPrijzen()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: cspBasis/TBX/enu/Verwerker.cls.xml
===================================================================
diff -u -r64269 -r64409
--- cspBasis/TBX/enu/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64269)
+++ cspBasis/TBX/enu/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64409)
@@ -7,11 +7,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;SFS;LMC;MBHO;HFLB;VHEPN;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;HFLD;HFLSE;HFLFI;HFLIT;HFLAT</Default>
+<Default>;SFS;LMC;MBHO;HFLB;VHEPN;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;HFLD;HFLSE;HFLFI;HFLIT;HFLAT;OPO</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;VHEPN;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;HaefeleDuitsland;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk</Default>
+<Default>;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;VHEPN;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;HaefeleDuitsland;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO</Default>
 </Parameter>
 
 <Method name="SFS">
@@ -21,6 +21,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="OPO">
+<ClassMethod>1</ClassMethod>
+<ReturnType>cspBasis.TBX.enu.Verwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).OPO()
+]]></Implementation>
+</Method>
+
 <Method name="OptimaPack">
 <ClassMethod>1</ClassMethod>
 <ReturnType>cspBasis.TBX.enu.Verwerker</ReturnType>
Index: cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml
===================================================================
diff -u -r64269 -r64409
--- cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64269)
+++ cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64409)
@@ -36,6 +36,8 @@
 		Do ..VerwerkKisch()
 	} ElseIf Verwerker = "MBHO" {
 		Do ..VerwerkMeubelBeslagHolland()
+	} ElseIf Verwerker = "OPO" {
+		Do ..VerwerkOPO()
 	} ElseIf Verwerker = "LMC" {
 		Do ..VerwerkOptimaPack()
 	} ElseIf Verwerker = "SFS" {
@@ -123,6 +125,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkOptimaPack">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml
===================================================================
diff -u -r64269 -r64409
--- BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64269)
+++ BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64409)
@@ -38,6 +38,8 @@
 		Do ..VerwerkHein()
 	} ElseIf HoofdingType = "NOTEBORN" {
 		Do ..VerwerkNoteborn()
+	} ElseIf HoofdingType = "OPO" {
+		Do ..VerwerkOPO()
 	} ElseIf HoofdingType = "SFS" {
 		Do ..VerwerkSFS()
 	} ElseIf HoofdingType = "VHEPN" {
@@ -129,6 +131,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml
===================================================================
diff -u -r64303 -r64409
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 64303)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 64409)
@@ -368,7 +368,7 @@
 <Implementation><![CDATA[
 	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	#dim IsVersie002Compliant As %Boolean = $$$False
-	If (##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID() , Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,Personality.HaefeleIT,Personality.HaefeleAT, Personality.Daro,Personality.Galimberti, Personality.Dupont, Personality.Kisch )) {
+	If (##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID() , Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI,Personality.HaefeleIT,Personality.HaefeleAT, Personality.Daro,Personality.Galimberti, Personality.Dupont, Personality.Kisch,Personality.OPO )) {
 		Set IsVersie002Compliant = $$$True
 	}
 	Quit IsVersie002Compliant
Index: BL/Legacy/DCPRINT2.cls.xml
===================================================================
diff -u -r64269 -r64409
--- BL/Legacy/DCPRINT2.cls.xml	(.../DCPRINT2.cls.xml)	(revision 64269)
+++ BL/Legacy/DCPRINT2.cls.xml	(.../DCPRINT2.cls.xml)	(revision 64409)
@@ -181,6 +181,8 @@
 		Set IsAfdrukOpBlancoPapier = $$$True
 	}ElseIf ((PersonalityId = Personality.VanRaemdonck)) {
 		Set IsAfdrukOpBlancoPapier = $$$True
+	}ElseIf ((PersonalityId = Personality.OPO)) {
+		Set IsAfdrukOpBlancoPapier = $$$True
 	}ElseIf ((PersonalityId = Personality.CampeTonny)) {
 		Set IsAfdrukOpBlancoPapier = $$$True
 	}
Index: vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/OPO.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/OPO.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/OPO.cls.xml	(revision 64409)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.OPO">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.OPO,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="%OnNew">
+<FormalSpec>Logger:vhLib.Logger="",OfferteGenerator:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator="",HttpPoster:TECH.Http.Poster=""</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Verzend">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Verzend",Offerte)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant/Verwerker.cls.xml
===================================================================
diff -u -r58528 -r64409
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58528)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64409)
@@ -34,6 +34,8 @@
 		Do ..VerwerkHein()
 	} ElseIf CheckoutTypeStandaardKlant = "K||19455" {
 		Do ..VerwerkOElmi()
+	} ElseIf CheckoutTypeStandaardKlant = "K||30467" {
+		Do ..VerwerkOPO()
 	} ElseIf CheckoutTypeStandaardKlant = "K||6279" {
 		Do ..VerwerkOptimaPack()
 	} ElseIf CheckoutTypeStandaardKlant = "K||3513" {
@@ -117,6 +119,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkOptimaPack">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 64269)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 64409)
@@ -233,6 +233,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..Mail.VoegToeOntvanger("jwi@vanhoecke.be")
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r64269 -r64409
--- vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 64269)
+++ vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 64409)
@@ -49,6 +49,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/OPO.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/OPO.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/OPO.cls.xml	(revision 64409)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.OPO">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.OPO</Super>
+
+<Method name="Verzend">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml
===================================================================
diff -u -r64269 -r64409
--- vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 64269)
+++ vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 64409)
@@ -43,6 +43,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml	(.../LoginParametersNaarSessieConverter.cls.xml)	(revision 64269)
+++ APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml	(.../LoginParametersNaarSessieConverter.cls.xml)	(revision 64409)
@@ -119,6 +119,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..WebshopSessie = ##class(APPS.EC.impl.SFSWebshopSessie).%New(..LoginParameters.GebruikerID)
+	Do ..BewaarKlant(OPOPersonality,..GeefKlantData())
+	Do ..WebshopSessie.ZetKlant(..LoginParameters.KlantID,..LoginParameters.KlantNaam)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r64269 -r64409
--- vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 64269)
+++ vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 64409)
@@ -45,6 +45,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/VKP/Korting/impl/KortingFactory.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/VKP/Korting/impl/KortingFactory.cls.xml	(.../KortingFactory.cls.xml)	(revision 64269)
+++ APPS/VKP/Korting/impl/KortingFactory.cls.xml	(.../KortingFactory.cls.xml)	(revision 64409)
@@ -89,6 +89,10 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<Private>1</Private>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 64269)
+++ APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 64409)
@@ -105,6 +105,10 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 64269)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 64409)
@@ -43,6 +43,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="HttpZenderOPO">
+<Type>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.OPO</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Offerte">
 <Type>APPS.VKP.Offerte</Type>
 <Private>1</Private>
@@ -54,7 +59,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MailVerzenderHandel:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender.Handel,VanHoeckeMailVerzender:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender.VanHoecke,WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository,HttpZenderSFS:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.SFS,HttpZenderDaro:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Daro,HttpZenderHaefele:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.HaefeleBE,HttpZenderGalimberti:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Galimberti,HttpZenderDupont:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Dupont,HttpZenderKisch:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Kisch</FormalSpec>
+<FormalSpec>MailVerzenderHandel:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender.Handel,VanHoeckeMailVerzender:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.MailVerzender.VanHoecke,WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository,HttpZenderSFS:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.SFS,HttpZenderDaro:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Daro,HttpZenderHaefele:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.HaefeleBE,HttpZenderGalimberti:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Galimberti,HttpZenderDupont:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Dupont,HttpZenderKisch:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Kisch,HttpZenderOPO:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.OPO</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -69,6 +74,7 @@
 	set ..HttpZenderGalimberti = $$$Inject(HttpZenderGalimberti,##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Galimberti).%New())
 	Set ..HttpZenderDupont = $$$Inject(HttpZenderDupont,##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Dupont).%New())
 	Set ..HttpZenderKisch = $$$Inject(HttpZenderKisch,##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.Kisch).%New())
+	Set ..HttpZenderOPO = $$$Inject(HttpZenderOPO,##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.OPO).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -195,6 +201,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	;Do ..MailVerzenderHandel.Rapporteer(..Offerte)
+	Do ..HttpZenderOPO.Verzend(..Offerte)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml	(.../PersonalityEnVerwerkerLinker.cls.xml)	(revision 64269)
+++ APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml	(.../PersonalityEnVerwerkerLinker.cls.xml)	(revision 64409)
@@ -38,6 +38,8 @@
 		Set PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).SFS() {
 		Set PersonalityID = ##class(DOM.common.enu.Personality).SFS()
+	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).OPO() {
+		Set PersonalityID = ##class(DOM.common.enu.Personality).OPO()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleBelgie() {
 		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleBE()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleNederland() {
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant.cls.xml
===================================================================
diff -u -r58528 -r64409
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant.cls.xml	(.../CheckoutTypeStandaardKlant.cls.xml)	(revision 58528)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant.cls.xml	(.../CheckoutTypeStandaardKlant.cls.xml)	(revision 64409)
@@ -5,12 +5,12 @@
 
 <Parameter name="DISPLAYLIST">
 <Type>%String</Type>
-<Default>,K||12486,K||7833,K||6279,K||23968,K||19455,K||29070</Default>
+<Default>,K||12486,K||7833,K||6279,K||23968,K||19455,K||29070,K||25319,K||4943,K||30467,K||3878,K||2865,K||29279,K||21672,K||22062,K||1571,K||3513,K||30467</Default>
 </Parameter>
 
 <Parameter name="VALUELIST">
 <Type>%String</Type>
-<Default>,K||12486,K||7833,K||6279,K||23968,K||19455,K||29070</Default>
+<Default>,K||12486,K||7833,K||6279,K||23968,K||19455,K||29070,K||25319,K||4943,K||30467,K||3878,K||2865,K||29279,K||21672,K||22062,K||1571,K||3513,K||30467</Default>
 </Parameter>
 
 <Method name="SFS">
@@ -20,6 +20,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="OPO">
+<ClassMethod>1</ClassMethod>
+<ReturnType>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant</ReturnType>
+<Implementation><![CDATA[	Quit ..MaakPartijID(30467)
+]]></Implementation>
+</Method>
+
 <Method name="Hein">
 <ClassMethod>1</ClassMethod>
 <ReturnType>WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.enu.CheckoutTypeStandaardKlant</ReturnType>
Index: APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 64269)
+++ APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 64409)
@@ -103,6 +103,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..ToonExceptie(OPOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..ToonExceptie(VanHoeckePersonality)
Index: vhDeploy/Deploy20210512xLogoVoorOPO.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20210512xLogoVoorOPO.cls.xml	(revision 0)
+++ vhDeploy/Deploy20210512xLogoVoorOPO.cls.xml	(revision 64409)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20210512xLogoVoorOPO">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Logo OPO</Default>
+</Parameter>
+
+<Property name="Service">
+<Type>APPS.VKP.RegioBeheerService</Type>
+</Property>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Set ^IPCom("CS","LOGO30467",0) = "LogoOPO.png"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: BL/Legacy/FactuurMailAfzenderBepaler.cls.xml
===================================================================
diff -u -r64269 -r64409
--- BL/Legacy/FactuurMailAfzenderBepaler.cls.xml	(.../FactuurMailAfzenderBepaler.cls.xml)	(revision 64269)
+++ BL/Legacy/FactuurMailAfzenderBepaler.cls.xml	(.../FactuurMailAfzenderBepaler.cls.xml)	(revision 64409)
@@ -132,6 +132,10 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkVanHoeckeVoorHalux">
 <FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/Kisch.cls.xml
===================================================================
diff -u -r62990 -r64409
--- vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/Kisch.cls.xml	(.../Kisch.cls.xml)	(revision 62990)
+++ vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/Kisch.cls.xml	(.../Kisch.cls.xml)	(revision 64409)
@@ -9,8 +9,7 @@
 
 <Method name="Verzend">
 <FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml
===================================================================
diff -u -r64281 -r64409
--- vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml	(.../Test.cls.xml)	(revision 64281)
+++ vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml	(.../Test.cls.xml)	(revision 64409)
@@ -53,6 +53,7 @@
 	Do ..VerkoopApiStub.IndienMethodCall("GeefKlant","K||7833").DanReturn(..ExpediteurKlant)
 	Do ..VerkoopApiStub.IndienMethodCall("GeefKlant","K||1736").DanReturn(..OnzeDienstenKlant)
 	Do ..VerkoopApiStub.IndienMethodCall("GeefKlant","K||1523").DanReturn(..DirecteLeveringKlant)
+	Do ..VerkoopApiStub.IndienMethodCall("GeefKlant","K||30467").DanReturn(..ExpediteurKlant)
 ]]></Implementation>
 </Method>
 
@@ -190,6 +191,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Winkelkar voor handelsklant (OPO)">
+<Implementation><![CDATA[
+	Do ..Winkelkar.ZetPersonalityID(##class(DOM.common.enu.Personality).OPO())
+		
+	Set PartijApiStub = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
+	Do PartijApiStub.IndienMethodCall("GeefPartij",$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.DOM.PARTIJ.Partij).StandaardPartij())
+	
+	Set VerzendWijzeBepaler = ##class(APPS.EC.impl.VerzendWijzeBepaler).%New(..VerkoopApiStub, PartijApiStub)
+	#dim VerzendWijze As APPS.VKP.VerzendWijze = VerzendWijzeBepaler.GeefVerzendWijze(..Winkelkar)
+	
+	Do $$$AssertEquals(VerzendWijze.VerzendWijzeID,"EX")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Winkelkar voor Seefelder (niet HäfeleNL)">
 <Implementation><![CDATA[
 	Do ..Winkelkar.ZetPersonalityID(##class(DOM.common.enu.Personality).Seefelder())
Index: PRGACNTs.inc.rou
===================================================================
diff -u -r64269 -r64409
--- PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 64269)
+++ PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 64409)
@@ -138,6 +138,7 @@
 	#define HafeleFIKey				   "Qv/Tz-(]u$k6!u@$"
 	#define HafeleITKey				   "<p+S+d5bhM~'5QSx"
 	#define HafeleATKey				   "Y$n7;6s?DQy72($;"
+	#define OPOKey					   "{y,26me!}U\UnWFc"
 	
 	; Toegang voor OptimaFIX page : beperkt via controle op IP-adres 
 	;   !!! Te compileren in routines :           
Index: vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml
===================================================================
diff -u -r64269 -r64409
--- vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 64269)
+++ vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 64409)
@@ -184,6 +184,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: vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r64269 -r64409
--- vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 64269)
+++ vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 64409)
@@ -87,6 +87,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkOPO",OPOPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkSFS",SFSPersonality)
Index: APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml	(.../OfferteKlantDataBepaler.cls.xml)	(revision 64269)
+++ APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml	(.../OfferteKlantDataBepaler.cls.xml)	(revision 64409)
@@ -41,6 +41,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyKlantData()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInDummyKlantData()
Index: BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml
===================================================================
diff -u -r64269 -r64409
--- BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64269)
+++ BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64409)
@@ -100,6 +100,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="OPO">
+<Type>%String</Type>
+<InitialExpression>"OPO"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="SFS">
 <Type>%String</Type>
 <InitialExpression>"SFS"</InitialExpression>
Index: APPS/EC/impl/KlantDataReferentieBepaler.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 64269)
+++ APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 64409)
@@ -302,6 +302,10 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkGalimberti">
 <FormalSpec>GalimbertiPersonality:DOM.common.GalimbertiPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatieEnEmail(GalimbertiPersonality)
Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml
===================================================================
diff -u -r64269 -r64409
--- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 64269)
+++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 64409)
@@ -479,6 +479,37 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).OPO()
+
+	Set ..LeverbonHoofding.ColLeftWidth = "40mm"
+	Set ..LeverbonHoofding.ColRightWidth = "73mm"
+
+	#dim URL As %String = ""
+
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(##class(DOM.VKP.enu.Klant).OPO())
+	If Klant.HeeftEigenLogo(){
+		Set URL = "\\fop\Resources\Media\KlantLogos\"
+		#dim Bestand As %String = Klant.GeefLogo()
+		#dim Extensie As %String = ##class(TECH.StringUtils).GetLastPart(Bestand,".")
+		Set URL = ##class(TECH.Files).AppendFile(URL,Bestand)
+		Set ..LeverbonHoofding.LOGO = ##class(BL.FOP.Basis.pxAttribType).Create(URL,##class(TECH.StringUtils).ToUpper(Extensie),,)
+	}	    
+	Set ..LeverbonHoofding.NAAM = "OPO Oeschger AG"
+	Set ..LeverbonHoofding.STRAATNRBUS = "Steinackerstrasse 68"    
+	Set ..LeverbonHoofding.WOONPLAATS = "Kloten"
+	Set ..LeverbonHoofding.POSTCODE = "8302"
+	Set ..LeverbonHoofding.TELEFOON = "+41 (0)44 804 33 11"	
+	Set ..LeverbonHoofding.EMAIL = "opo@opo.ch"
+	Set ..LeverbonHoofding.T1 = "VAT:CHE-390.751.435"
+	Set ..LeverbonHoofding.T3 = "" ;"Deutsche Bank: "
+	Set ..LeverbonHoofding.T4 = "" ;"IBAN DE08690700320041581000 "
+	Set ..LeverbonHoofding.T5 = "" ;"BIC: DEUTDE6F690"
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoeckeVoorHalux">
 <FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: cspBasis/TBX/Lib.mac.rou
===================================================================
diff -u -r64269 -r64409
--- cspBasis/TBX/Lib.mac.rou	(.../Lib.mac.rou)	(revision 64269)
+++ cspBasis/TBX/Lib.mac.rou	(.../Lib.mac.rou)	(revision 64409)
@@ -162,6 +162,7 @@
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleFinland() $$$HafeleFIKey
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleItalie() $$$HafeleITKey
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleOostenrijk() $$$HafeleATKey
+	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).OPO() $$$OPOKey
 	Quit "DummyKey"
 	
 
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/OPO.cls.xml
===================================================================
diff -u
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/OPO.cls.xml	(revision 0)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/OPO.cls.xml	(revision 64409)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.OPO">
+<Super>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator</Super>
+
+<Property name="DoorHandelMeeleverensMelder">
+<Type>APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService="",ProductAPI:DOM.PM.ProductAPI="",DoorHandelMeeleverensMelder:APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do ##super(WinkelkarService,WinkelkarRepository,UrlBepaler,TotaalEnPrijsBerekenaar,KlantDataBepaler,PersonalityService,ProductAPI)
+
+	Set ..DoorHandelMeeleverensMelder = $$$Inject(DoorHandelMeeleverensMelder, ##class(APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ZetMaatwerkOmschrijvingen">
+<FormalSpec>OfferteLijn:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteLijn002,MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do ..ZetDeNieuweMaatwerkOmschrijvingen(OfferteLijn,MaatwerkLijn)
+]]></Implementation>
+</Method>
+
+<Method name="ZetProductOmschrijvingen">
+<FormalSpec>OfferteLijn:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteLijn002,ProductLijn:DOM.EC.Winkelkar.ProductLijn</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do ..ZetDeNieuweProductOmschrijvingen(OfferteLijn,ProductLijn)
+]]></Implementation>
+</Method>
+
+<Method name="GeefKortTekst">
+<FormalSpec>PRNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..ProductAPI.GeefProduct(PRNr).GeefKorttekst()
+]]></Implementation>
+</Method>
+
+<Method name="GeefIdentNr">
+<FormalSpec>PRNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $$$Replace( ..ProductAPI.GeefProduct(PRNr).GeefIdentNr(),".","")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/OPO.cls.xml
===================================================================
diff -u
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/OPO.cls.xml	(revision 0)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/OPO.cls.xml	(revision 64409)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.OPO">
+<Super>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender,TECH.Mockable</Super>
+
+<Method name="%OnNew">
+<FormalSpec>Logger:vhLib.Logger="",OfferteGenerator:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator="",HttpPoster:TECH.Http.Poster=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+
+	#dim OPOOfferteGenerator As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.OPO = ""
+	Set OPOOfferteGenerator = $$$Inject(OfferteGenerator,##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.OPO).%New())
+
+	Do ##super(Logger,OPOOfferteGenerator,HttpPoster)
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefPersonality">
+<Private>1</Private>
+<ReturnType>DOM.common.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.OPOPersonality).Instance() // Eigenlijk moet hij de personality van de winkelkar nemen...
+]]></Implementation>
+</Method>
+
+<Method name="GeefHttpMessage">
+<FormalSpec>XMLStream:%Stream</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.Http.Message</ReturnType>
+<Implementation><![CDATA[
+	// opgelet : configuratie van iis nodig op ax-loadbalancer
+	#dim ServerIP As %String = "ax-loadbalancerTODO.vanhoecke.be"
+	#dim HttpMessage As TECH.Http.Message = ##class(TECH.Http.Message).%New()
+		
+	Set HttpMessage.Server = ServerIP
+	If ..RunsInTestmode() {
+		Set HttpMessage.Location = ""
+	} Else {
+		Set HttpMessage.Location = ""
+	}
+	Set HttpMessage.Location = HttpMessage.Location_ ""
+	Set HttpMessage.ContentType = "text/xml"
+	Set HttpMessage.ContextEncoding = "UTF-8"
+	Set HttpMessage.Data = XMLStream
+	
+	Quit HttpMessage
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml	(.../KlantRapporteurVhisie3.cls.xml)	(revision 64269)
+++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml	(.../KlantRapporteurVhisie3.cls.xml)	(revision 64409)
@@ -127,6 +127,10 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant/AutoComplete.cls.xml
===================================================================
diff -u -r58528 -r64409
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58528)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/enu/CheckoutTypeStandaardKlant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64409)
@@ -86,6 +86,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="OPO">
+<Type>%String</Type>
+<InitialExpression>"K||30467"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="OptimaPack">
 <Type>%String</Type>
 <InitialExpression>"K||6279"</InitialExpression>
Index: cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml
===================================================================
diff -u -r64269 -r64409
--- cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64269)
+++ cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64409)
@@ -93,6 +93,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="OPO">
+<Type>%String</Type>
+<InitialExpression>"OPO"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="OptimaPack">
 <Type>%String</Type>
 <InitialExpression>"LMC"</InitialExpression>
Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml
===================================================================
diff -u -r64269 -r64409
--- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml	(.../KlantRapporteurVhisie4.cls.xml)	(revision 64269)
+++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml	(.../KlantRapporteurVhisie4.cls.xml)	(revision 64409)
@@ -139,6 +139,10 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkOPO">
+<FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r64269 -r64409
--- vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 64269)
+++ vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 64409)
@@ -191,6 +191,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)