Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/Order.txt
===================================================================
diff -u -r39866 -r39917
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/Order.txt	(.../Order.txt)	(revision 39866)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/Order.txt	(.../Order.txt)	(revision 39917)
@@ -1,6 +1,6 @@
 MultDim=""
 MultDim(7833,0)=110
-MultDim(7833,1)=\08.04.15\08.04.15 DummyOrderReferentie\\\7833\EX;1`EX;4`EX;5\1000##63650,33300\\\\\\1\\\\EUR\Hein_Klant, Weemaes, H�ttenstra�e 45, 57223  Kreuztal, DE\\30\\\\\\\\\\\\\\\\\\\1\\\\\\\\\\\\\UNI\\\\4
+MultDim(7833,1)=\08.04.15\08.04.15 DummyOrderReferentie\\\7833\EX;1`EX;4`EX;5\1000##63650,33300\\\\\\1\\\\EUR\Hein_Klant\\30\\\\\\\\\\\\\\\\\\\1\\\\\\\\\\\\\UNI\\\\4
 MultDim(7833,2)=""
 MultDim(7833,3)=\Weemaes\Patrick\Herr\H�ttenstra�e 45\57223 \Kreuztal\1052\D
 MultDim(7833,4)=10
Index: vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/Test.cls.xml
===================================================================
diff -u -r37517 -r39917
--- vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/Test.cls.xml	(.../Test.cls.xml)	(revision 37517)
+++ vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/Test.cls.xml	(.../Test.cls.xml)	(revision 39917)
@@ -65,6 +65,7 @@
 	Do OfferteStub.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
 	Do OfferteStub.IndienMethodCall("GeefAangemaaktDoor").DanReturn(..GebruikerID)
 	Do OfferteStub.IndienMethodCall("GeefPersonality").DanReturn(Personality)
+	Do OfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(..GeenAdres())
 	
 	Set KlantDataReferentieBepaler = ##class(APPS.EC.impl.KlantDataReferentieBepaler).%New()
 	quit KlantDataReferentieBepaler.GeefKlantDataReferentie(OfferteStub)
@@ -75,6 +76,12 @@
 <Private>1</Private>
 </Method>
 
+<Method name="GeenAdres">
+<Private>1</Private>
+<Implementation><![CDATA[	quit ##class(DOM.VKP.impl.LeverAdres).%New()
+]]></Implementation>
+</Method>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder.cls.xml
===================================================================
diff -u -r39818 -r39917
--- APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder.cls.xml	(.../HandelOfferteNaarVanHoeckeOfferteConverteerder.cls.xml)	(revision 39818)
+++ APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder.cls.xml	(.../HandelOfferteNaarVanHoeckeOfferteConverteerder.cls.xml)	(revision 39917)
@@ -105,9 +105,6 @@
 	#dim DataService As APPS.common.DataService = ..CommonAPI.GeefDataService(OfferteVanHandel.GeefPersonalityID())
 	#dim KlantData As DOM.common.dto.KlantData = DataService.GeefKlantData(OfferteVanHandel.GeefKlantID())
 	Set DocumentReferenties.CommissieReferentie = ##class(TECH.StringUtils).Append(DocumentReferenties.CommissieReferentie, KlantData.Naam, ", ")
-	
-	#dim LeverAdresInStringFormaat As %String = ..GeefLeverAdresInStringFormaat(OfferteVanHandel)
-	Set:$$$HasLength(LeverAdresInStringFormaat) DocumentReferenties.CommissieReferentie = ##class(TECH.StringUtils).Append(DocumentReferenties.CommissieReferentie, LeverAdresInStringFormaat, ", ")
 ]]></Implementation>
 </Method>
 
@@ -136,18 +133,6 @@
 	}
 ]]></Implementation>
 </Method>
-
-<Method name="GeefLeverAdresInStringFormaat">
-<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim LeverAdres As DOM.VKP.LeverAdres = Offerte.GeefLeverAdres()
-	if $$$HasLength(LeverAdres.GeefNaam()) && $$$HasLength(LeverAdres.GeefStraat()) {
-		quit LeverAdres.GeefNaam()_ ", " _ LeverAdres.GeefStraat() _ ", " _ LeverAdres.GeefPostcode()_ " " _ LeverAdres.GeefGemeente() _ ", " _ LeverAdres.GeefLand().GeefCode()
-	}
-	quit ""
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/Mail_003.html
===================================================================
diff -u -r39818 -r39917
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/Mail_003.html	(.../Mail_003.html)	(revision 39818)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/Mail_003.html	(.../Mail_003.html)	(revision 39917)
@@ -3,4 +3,4 @@
 Ontvangers: 
 	OV_weborder_R12
 Data:
-<br/>Bestelling voor klant 7833 'HEIN F.' <br/><br/><a href='vhintra:vkp-externeofferteverwerking-presentation-mainview?offerteId=2'>Verwerk offerte '2'</a><br/><br/>Bestelopmerking : <br/>DummyBestelOpmerking<br/><br/>Bestel referentie : <br/>DummyOrderReferentie<br/><br/>Commissie referentie : <br/>Hein_Klant, Weemaes, H�ttenstra�e 45, 57223  Kreuztal, DE
\ No newline at end of file
+<br/>Bestelling voor klant 7833 'HEIN F.' <br/><br/><a href='vhintra:vkp-externeofferteverwerking-presentation-mainview?offerteId=2'>Verwerk offerte '2'</a><br/><br/>Bestelopmerking : <br/>DummyBestelOpmerking<br/><br/>Bestel referentie : <br/>DummyOrderReferentie<br/><br/>Commissie referentie : <br/>Hein_Klant
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/Mail_002.html
===================================================================
diff -u -r39803 -r39917
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/Mail_002.html	(.../Mail_002.html)	(revision 39803)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/Mail_002.html	(.../Mail_002.html)	(revision 39917)
@@ -9,7 +9,7 @@
 Ein Auftrag ist aufgegeben auf dem Webshop mit den folgenden Informationen: <BR>
 Bestellung: 1<BR>
 Kunde: <BR>
-Hein_Klant<BR>
+Hein_Klant - Adres: Weemaes, H�ttenstra�e 45, 57223  Kreuztal, DE<BR>
 <BR>
 Hinweis: <BR>
 DummyOrderReferentie<BR>
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/BestellingAleenLezenVersie.xml
===================================================================
diff -u -r39866 -r39917
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/BestellingAleenLezenVersie.xml	(.../BestellingAleenLezenVersie.xml)	(revision 39866)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/BestellingAleenLezenVersie.xml	(.../BestellingAleenLezenVersie.xml)	(revision 39917)
@@ -368,7 +368,7 @@
       <Hoofding>
         <Referentie>
           <OrderReferentie>DummyOrderReferentie</OrderReferentie>
-          <CommissieReferentie>Hein_Klant, Weemaes, Hüttenstraße 45, 57223  Kreuztal, DE</CommissieReferentie>
+          <CommissieReferentie>Hein_Klant</CommissieReferentie>
         </Referentie>
         <LeveringDetail>
           <Datum>2015-04-08</Datum>
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/BesteldeOfferte.xml
===================================================================
diff -u -r39866 -r39917
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/BesteldeOfferte.xml	(.../BesteldeOfferte.xml)	(revision 39866)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/Hein/Hein_Klant/HeinGebruiker/BesteldeOfferte.xml	(.../BesteldeOfferte.xml)	(revision 39917)
@@ -367,7 +367,7 @@
     <Hoofding>
       <Referentie>
         <OrderReferentie>DummyOrderReferentie</OrderReferentie>
-        <CommissieReferentie>Hein_Klant, Weemaes, Hüttenstraße 45, 57223  Kreuztal, DE</CommissieReferentie>
+        <CommissieReferentie>Hein_Klant</CommissieReferentie>
       </Referentie>
       <LeveringDetail>
         <Datum>2015-04-08</Datum>
Index: APPS/EC/impl/KlantDataReferentieBepaler.cls.xml
===================================================================
diff -u -r36503 -r39917
--- APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 36503)
+++ APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 39917)
@@ -120,6 +120,9 @@
 	
 	#dim Email As %String = KlantData.EmailAdres
 	Do ..VoegToeIndienNodig(Email)
+	
+	#dim LeverAdresInStringFormaat As %String = ..GeefLeverAdresInStringFormaat(..Offerte)
+	Do ..VoegToeIndienNodig(LeverAdresInStringFormaat)
 ]]></Implementation>
 </Method>
 
@@ -153,6 +156,9 @@
 	
 	#dim FAX As %String = KlantData.FaxNummer
 	Do ..VoegToeIndienNodig(FAX,"Fax: ")
+	
+		#dim LeverAdresInStringFormaat As %String = ..GeefLeverAdresInStringFormaat(..Offerte)
+	Do ..VoegToeIndienNodig(LeverAdresInStringFormaat,"Adres: ")
 ]]></Implementation>
 </Method>
 
@@ -170,6 +176,18 @@
 	Quit KlantID
 ]]></Implementation>
 </Method>
+
+<Method name="GeefLeverAdresInStringFormaat">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim LeverAdres As DOM.VKP.LeverAdres = Offerte.GeefLeverAdres()
+	if $$$HasLength(LeverAdres.GeefNaam()) && $$$HasLength(LeverAdres.GeefStraat()) {
+		quit LeverAdres.GeefNaam()_ ", " _ LeverAdres.GeefStraat() _ ", " _ LeverAdres.GeefPostcode()_ " " _ LeverAdres.GeefGemeente() _ ", " _ LeverAdres.GeefLand().GeefCode()
+	}
+	quit ""
+]]></Implementation>
+</Method>
 </Class>