Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml
===================================================================
diff -u -r35899 -r35945
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 35899)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 35945)
@@ -11,7 +11,8 @@
 <Method name="VerwittigVerwerker">
 <FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
 <Implementation><![CDATA[
-	Set ..Offerte=Offerte
+	Set ..Offerte = Offerte
+	
 	#dim Personality As DOM.common.Personality = Offerte.GeefPersonality()
 	Do Personality.Accept($this)
 ]]></Implementation>
@@ -23,6 +24,36 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkDestil">
+<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwittigHandelOfferteBesteld()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDupont">
+<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwittigHandelOfferteBesteld()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkKisch">
+<FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwittigHandelOfferteBesteld()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanRaemdonck">
+<FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwittigHandelOfferteBesteld()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDaro">
+<FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwittigHandelOfferteBesteld()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.SFS.Melder).%New().Meld(..Offerte)
@@ -34,7 +65,7 @@
 <Implementation><![CDATA[
 	Try {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("VerwerkHaefeleBE nog niet geïmplementeerd."))
-	}Catch{
+	} Catch {
 		#dim MailAPI As TECH.Mail.MailAPI = ##class(TECH.Context).Instance().GeefMailAPI()
 		#dim Mail As TECH.Mail.Mail = MailAPI.MaakNieuwMail()
 		Do Mail.ZetInhoud(##class(TECH.ExceptionHandler).Catch().GeefOmschrijving())
@@ -52,42 +83,46 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwittigHandelOfferteBesteld">
+<Implementation><![CDATA[
+	#dim Rapporteur As APPS.EC.Rapporteur.Rapporteur = ##class(APPS.EC.Rapporteur.impl.HandelRapporteur).%New(..Offerte)
+	Do Rapporteur.Rapporteer()
+]]></Implementation>
+</Method>
+
 <Method name="VerwittigOVOfferteBesteld">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
 <Implementation><![CDATA[
 	#dim Partij As DOM.PARTIJ.Partij = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(Offerte.KlantID)
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(Offerte.KlantID)
 	#dim KlantNr As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Partij.GeefID())
-	
-	#dim Titel As %String = "Bestelling voor klant "_KlantNr_" '"_Partij.GeefNaam()_"' "
-	
-	#dim Inhoud As %String = $$$CRLF_Titel
-	Set Inhoud = Inhoud_$$$CRLF_$$$CRLF
-		_"<a href='"_..GeefURIVerwerkOfferte(Offerte.GeefID())_"'>"
-		_"Verwerk offerte '"_Offerte.GeefID()_"'"
-		_"</a>"
-	If Offerte.BestelOpmerking '= "" {
-		Set Inhoud = Inhoud_$$$CRLF_$$$CRLF
-			_"Bestelopmerking : "_$$$CRLF_Offerte.BestelOpmerking	
-	}
+	#dim Titel As %String = "Bestelling voor klant " _ KlantNr _ " '" _ Partij.GeefNaam() _ "' "
 	#dim BestelReferentie As %String = Offerte.GeefDocumentReferenties().OrderReferentie
-	If BestelReferentie '= "" {
-		Set Inhoud = Inhoud_$$$CRLF_$$$CRLF
-			_"Bestel referentie : "_$$$CRLF_BestelReferentie
-	}
 	#dim CommissieReferentie As %String = Offerte.GeefDocumentReferenties().CommissieReferentie
-	If CommissieReferentie '= "" {
-		Set Inhoud = Inhoud_$$$CRLF_$$$CRLF
-			_"Commissie referentie : "_$$$CRLF_CommissieReferentie
+	#dim Inhoud As %String = $$$CRLF _ Titel _ $$$CRLF _ $$$CRLF _ ..GeefVerwerkOfferteLink(Offerte.GeefID())
+
+	If $$$Not(Offerte.BestelOpmerking = "") {
+		Set Inhoud = Inhoud _ $$$CRLF _ $$$CRLF _ "Bestelopmerking : " _ $$$CRLF _ Offerte.BestelOpmerking	
 	}
-	#dim MailToPrefix As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.OV.impl.OrderVerwerkingInteracties.OfferteBesteld_MailToPrefix")
-	#dim MailTo As %String = MailToPrefix_##class(TECH.StringUtils).AddLeadingChar(Klant.GeefRegio(),"0",2)	
+	
+	If $$$Not(BestelReferentie = "") {
+		Set Inhoud = Inhoud _ $$$CRLF _ $$$CRLF _ "Bestel referentie : " _ $$$CRLF _ BestelReferentie
+	}
+
+	If $$$Not(CommissieReferentie = "") {
+		Set Inhoud = Inhoud _ $$$CRLF _ $$$CRLF _ "Commissie referentie : " _ $$$CRLF _ CommissieReferentie
+	}
+	
 	Set Inhoud = $REPLACE(Inhoud,$$$CRLF,"<br/>")
-	#dim IsHTML As %Boolean = 1
 	
+	#dim MailToPrefix As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.OV.impl.OrderVerwerkingInteracties.OfferteBesteld_MailToPrefix")
+	#dim MailTo As %String = MailToPrefix _ ##class(TECH.StringUtils).AddLeadingChar(Klant.GeefRegio(), "0", 2)	
+	#dim IsHTML As %Boolean = $$$True
+
 	#dim MailAPI As TECH.Mail.MailAPI = ##class(TECH.Context).Instance().GeefMailAPI()
 	#dim Mail As TECH.Mail.Mail = MailAPI.MaakNieuwMail()
+	
 	Do Mail.ZetVerzender($$$SystemMail("OV"))
 	Do Mail.VoegToeOntvanger(MailTo)
 	Do Mail.ZetOnderwerp(Titel)
@@ -104,47 +139,20 @@
 <Method name="GeefURIVerwerkOfferte">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>OfferteID:%String</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "vhintra:vkp-externeofferteverwerking-presentation-mainview?offerteId="_OfferteID
+<Implementation><![CDATA[	Quit "vhintra:vkp-externeofferteverwerking-presentation-mainview?offerteId=" _ OfferteID
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkDestil">
-<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwittigHandelOfferteBesteld()
+<Method name="GeefVerwerkOfferteLink">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>OfferteID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "<a href='" _ ..GeefURIVerwerkOfferte(OfferteID) _ "'>" _ "Verwerk offerte '" _ OfferteID _ "'" _ "</a>"
 ]]></Implementation>
 </Method>
-
-<Method name="VerwerkDupont">
-<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwittigHandelOfferteBesteld()
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkKisch">
-<FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwittigHandelOfferteBesteld()
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkVanRaemdonck">
-<FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwittigHandelOfferteBesteld()
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkDaro">
-<FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwittigHandelOfferteBesteld()
-]]></Implementation>
-</Method>
-
-<Method name="VerwittigHandelOfferteBesteld">
-<Implementation><![CDATA[
-	#Dim Rapporteur As APPS.EC.Rapporteur.Rapporteur = ##class(APPS.EC.Rapporteur.impl.HandelRapporteur).%New(..Offerte)
-	Do Rapporteur.Rapporteer()
-]]></Implementation>
-</Method>
 </Class>