Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/BestellingAleenLezenVersie.xml
===================================================================
diff -u -r51553 -r51736
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/BestellingAleenLezenVersie.xml	(.../BestellingAleenLezenVersie.xml)	(revision 51553)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/BestellingAleenLezenVersie.xml	(.../BestellingAleenLezenVersie.xml)	(revision 51736)
@@ -395,7 +395,7 @@
             <Taal>N</Taal>
           </Adres>
         </LeveringDetail>
-        <BestelOpmerking>DummyBestelOpmerking</BestelOpmerking>
+        <BestelOpmerking></BestelOpmerking>
       </Hoofding>
       <Winkelkar>
         <AantalProducten>4</AantalProducten>
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/Mail_002.html
===================================================================
diff -u -r40949 -r51736
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/Mail_002.html	(.../Mail_002.html)	(revision 40949)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/Mail_002.html	(.../Mail_002.html)	(revision 51736)
@@ -3,4 +3,4 @@
 Ontvangers: 
 	OV_weborder_R20
 Data:
-<br/>Bestelling voor klant 4875 'HAEFELE BELGIUM' <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/>HaefeleBE_Klant
\ No newline at end of file
+<br/>Bestelling voor klant 4875 'HAEFELE BELGIUM' <br/><br/><a href='vhintra:vkp-externeofferteverwerking-presentation-mainview?offerteId=2'>Verwerk offerte '2'</a><br/><br/>Bestel referentie : <br/>DummyOrderReferentie<br/><br/>Commissie referentie : <br/>HaefeleBE_Klant
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/Order.txt
===================================================================
diff -u -r51102 -r51736
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/Order.txt	(.../Order.txt)	(revision 51102)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/Order.txt	(.../Order.txt)	(revision 51736)
@@ -1,15 +1,13 @@
 MultDim=""
-MultDim(4875,0)=110
+MultDim(4875,0)=108
 MultDim(4875,1)=\08.04.15\08.04.15 DummyOrderReferentie\\\4875\DI2;1`DI2;2`DI2;3`DI2;4`DI2;5\1000##63650,33300\\\\\\\\\\EUR\HaefeleBE_KlantMetKorting\\00\\\\\\\\\\\\\\\\\\\1\\\\\\\\\\\\\UNI\\\\4\\((7, "hfleBE_1001MetKorting", 1), (1, "K||4875", 2))
 MultDim(4875,2)=""
 MultDim(4875,3)=\HAEFELE BELGIUM\\\LINDESTRAAT 5\9240\ZELE\1019\N\\\\\\\\\\\\\\\\\DI2;1`DI2;2`DI2;3`DI2;4`DI2;5
-MultDim(4875,4)=10
+MultDim(4875,4)=8
 MultDim(4875,101)=\\\\Levertijd: 08-04-2015\\\\\\\\\\100\\KF11\63650,33300;T;;-
 MultDim(4875,102)=\\\\UNI-EDI-nr: 1\\\\\\\\\\110\\KF11\63650,33300;T;;-
-MultDim(4875,103)=\\\\Opmerking:\\\\\\\\\\120\\KF11\63650,33300;T;;-
-MultDim(4875,104)=\\\\DummyBestelOpmerking\\\\\\\\\\130\\KF11\63650,33300;T;;OBF
-MultDim(4875,105)=\\\\\\\\\\\\\\140\\KF11\63650,33300;T;;OBF
-MultDim(4875,106)=703100\\1\\\58.36\40#0\8\58.36\58.36\703100\\\\150\58.36\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\MC;2397.78169014084507
-MultDim(4875,107)=703100\\1\\\122.22\40#0\8\122.22\122.22\703100\\\\160\122.22\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\MC;6397.042253521126761
-MultDim(4875,108)=703100\\1\\\50.13\40#0\8\50.13\50.13\703100\\\\170\50.13\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\8030;2880.070067055393586
-MultDim(4875,109)=703100\\1\\\57.86\40#0\8\57.86\57.86\703100\\\\180\57.86\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\8030;2879.629900714285713
+MultDim(4875,103)=\\\\\\\\\\\\\\120\\KF11\63650,33300;T;;-
+MultDim(4875,104)=703100\\1\\\58.36\40#0\8\58.36\58.36\703100\\\\130\58.36\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\MC;2397.78169014084507
+MultDim(4875,105)=703100\\1\\\122.22\40#0\8\122.22\122.22\703100\\\\140\122.22\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\MC;6397.042253521126761
+MultDim(4875,106)=703100\\1\\\50.13\40#0\8\50.13\50.13\703100\\\\150\50.13\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\8030;2880.070067055393586
+MultDim(4875,107)=703100\\1\\\57.86\40#0\8\57.86\57.86\703100\\\\160\57.86\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\8030;2879.629900714285713
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/BestellingAleenLezenVersie.xml
===================================================================
diff -u -r51553 -r51736
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/BestellingAleenLezenVersie.xml	(.../BestellingAleenLezenVersie.xml)	(revision 51553)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/BestellingAleenLezenVersie.xml	(.../BestellingAleenLezenVersie.xml)	(revision 51736)
@@ -395,7 +395,7 @@
             <Taal>N</Taal>
           </Adres>
         </LeveringDetail>
-        <BestelOpmerking>DummyBestelOpmerking</BestelOpmerking>
+        <BestelOpmerking></BestelOpmerking>
       </Hoofding>
       <Winkelkar>
         <AantalProducten>4</AantalProducten>
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/BesteldeOfferte.xml
===================================================================
diff -u -r51553 -r51736
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/BesteldeOfferte.xml	(.../BesteldeOfferte.xml)	(revision 51553)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/BesteldeOfferte.xml	(.../BesteldeOfferte.xml)	(revision 51736)
@@ -394,7 +394,7 @@
           <Taal>N</Taal>
         </Adres>
       </LeveringDetail>
-      <BestelOpmerking>DummyBestelOpmerking</BestelOpmerking>
+      <BestelOpmerking></BestelOpmerking>
     </Hoofding>
     <Winkelkar>
       <AantalProducten>4</AantalProducten>
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/BesteldeOfferte.xml
===================================================================
diff -u -r51553 -r51736
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/BesteldeOfferte.xml	(.../BesteldeOfferte.xml)	(revision 51553)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/BesteldeOfferte.xml	(.../BesteldeOfferte.xml)	(revision 51736)
@@ -394,7 +394,7 @@
           <Taal>N</Taal>
         </Adres>
       </LeveringDetail>
-      <BestelOpmerking>DummyBestelOpmerking</BestelOpmerking>
+      <BestelOpmerking></BestelOpmerking>
     </Hoofding>
     <Winkelkar>
       <AantalProducten>4</AantalProducten>
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/GedupliceerdeOfferte.xml
===================================================================
diff -u -r51553 -r51736
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/GedupliceerdeOfferte.xml	(.../GedupliceerdeOfferte.xml)	(revision 51553)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/GedupliceerdeOfferte.xml	(.../GedupliceerdeOfferte.xml)	(revision 51736)
@@ -18,7 +18,7 @@
         <Taal></Taal>
       </Adres>
     </LeveringDetail>
-    <BestelOpmerking>DummyBestelOpmerking</BestelOpmerking>
+    <BestelOpmerking></BestelOpmerking>
   </Hoofding>
   <Winkelkar>
     <AantalProducten>4</AantalProducten>
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/Mail_002.html
===================================================================
diff -u -r40949 -r51736
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/Mail_002.html	(.../Mail_002.html)	(revision 40949)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBEMetKorting/HaefeleBEGebruikerMetKorting/Mail_002.html	(.../Mail_002.html)	(revision 51736)
@@ -3,4 +3,4 @@
 Ontvangers: 
 	OV_weborder_R20
 Data:
-<br/>Bestelling voor klant 4875 'HAEFELE BELGIUM' <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/>HaefeleBE_KlantMetKorting
\ No newline at end of file
+<br/>Bestelling voor klant 4875 'HAEFELE BELGIUM' <br/><br/><a href='vhintra:vkp-externeofferteverwerking-presentation-mainview?offerteId=2'>Verwerk offerte '2'</a><br/><br/>Bestel referentie : <br/>DummyOrderReferentie<br/><br/>Commissie referentie : <br/>HaefeleBE_KlantMetKorting
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/GedupliceerdeOfferte.xml
===================================================================
diff -u -r51553 -r51736
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/GedupliceerdeOfferte.xml	(.../GedupliceerdeOfferte.xml)	(revision 51553)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/GedupliceerdeOfferte.xml	(.../GedupliceerdeOfferte.xml)	(revision 51736)
@@ -18,7 +18,7 @@
         <Taal></Taal>
       </Adres>
     </LeveringDetail>
-    <BestelOpmerking>DummyBestelOpmerking</BestelOpmerking>
+    <BestelOpmerking></BestelOpmerking>
   </Hoofding>
   <Winkelkar>
     <AantalProducten>4</AantalProducten>
Index: vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/Order.txt
===================================================================
diff -u -r51102 -r51736
--- vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/Order.txt	(.../Order.txt)	(revision 51102)
+++ vhTestFiles/IntegratieTests/Webshop.Offerte.IngaveTotBestelling/Test/HaefeleBE/HaefeleBE/HaefeleBEGebruiker/Order.txt	(.../Order.txt)	(revision 51736)
@@ -1,15 +1,13 @@
 MultDim=""
-MultDim(4875,0)=110
+MultDim(4875,0)=108
 MultDim(4875,1)=\08.04.15\08.04.15 DummyOrderReferentie\\\4875\DI2;1`DI2;2`DI2;3`DI2;4`DI2;5\1000##63650,33300\\\\\\\\\\EUR\HaefeleBE_Klant\\00\\\\\\\\\\\\\\\\\\\1\\\\\\\\\\\\\UNI\\\\4\\((7, "hfleBE_1000", 1), (1, "K||4875", 2))
 MultDim(4875,2)=""
 MultDim(4875,3)=\HAEFELE BELGIUM\\\LINDESTRAAT 5\9240\ZELE\1019\N\\\\\\\\\\\\\\\\\DI2;1`DI2;2`DI2;3`DI2;4`DI2;5
-MultDim(4875,4)=10
+MultDim(4875,4)=8
 MultDim(4875,101)=\\\\Levertijd: 08-04-2015\\\\\\\\\\100\\KF11\63650,33300;T;;-
 MultDim(4875,102)=\\\\UNI-EDI-nr: 1\\\\\\\\\\110\\KF11\63650,33300;T;;-
-MultDim(4875,103)=\\\\Opmerking:\\\\\\\\\\120\\KF11\63650,33300;T;;-
-MultDim(4875,104)=\\\\DummyBestelOpmerking\\\\\\\\\\130\\KF11\63650,33300;T;;OBF
-MultDim(4875,105)=\\\\\\\\\\\\\\140\\KF11\63650,33300;T;;OBF
-MultDim(4875,106)=703100\\1\\\58.36\40#0\8\58.36\58.36\703100\\\\150\58.36\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\MC;2397.78169014084507
-MultDim(4875,107)=703100\\1\\\122.22\40#0\8\122.22\122.22\703100\\\\160\122.22\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\MC;6397.042253521126761
-MultDim(4875,108)=703100\\1\\\50.13\40#0\8\50.13\50.13\703100\\\\170\50.13\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\8030;2880.070067055393586
-MultDim(4875,109)=703100\\1\\\57.86\40#0\8\57.86\57.86\703100\\\\180\57.86\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\8030;2879.629900714285713
+MultDim(4875,103)=\\\\\\\\\\\\\\120\\KF11\63650,33300;T;;-
+MultDim(4875,104)=703100\\1\\\58.36\40#0\8\58.36\58.36\703100\\\\130\58.36\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\MC;2397.78169014084507
+MultDim(4875,105)=703100\\1\\\122.22\40#0\8\122.22\122.22\703100\\\\140\122.22\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\MC;6397.042253521126761
+MultDim(4875,106)=703100\\1\\\50.13\40#0\8\50.13\50.13\703100\\\\150\50.13\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\8030;2880.070067055393586
+MultDim(4875,107)=703100\\1\\\57.86\40#0\8\57.86\57.86\703100\\\\160\57.86\KF0\\\\E1\EUR\\1\63650\=\\\\\\\\\\\\\\\\\\\\1\\8030;2879.629900714285713