Index: vhTestFiles/UnitTests/APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender.Verzend/Test/TestVerzendschrijftBLUMaankooporderinxmlformaatnaarbestand/EDI_BLUM_XML_OUT/AankoopOrder/Data20121211000001.xml
===================================================================
diff -u -r35429 -r35430
--- vhTestFiles/UnitTests/APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender.Verzend/Test/TestVerzendschrijftBLUMaankooporderinxmlformaatnaarbestand/EDI_BLUM_XML_OUT/AankoopOrder/Data20121211000001.xml	(.../Data20121211000001.xml)	(revision 35429)
+++ vhTestFiles/UnitTests/APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender.Verzend/Test/TestVerzendschrijftBLUMaankooporderinxmlformaatnaarbestand/EDI_BLUM_XML_OUT/AankoopOrder/Data20121211000001.xml	(.../Data20121211000001.xml)	(revision 35430)
@@ -116,10 +116,11 @@
       <PEINH>100</PEINH>
       <NETWR>6.96</NETWR>
       <PREIS>11.6</PREIS>
-      <E1EDP03 SEGMENT="1">
-        <IDDAT>002</IDDAT>
-        <DATUM>20121214</DATUM>
-      </E1EDP03>
+      <E1EDP20 SEGMENT="1">
+        <WMENG>500.</WMENG>
+        <AMENG>0.000</AMENG>
+        <EDATU>20121214</EDATU>
+      </E1EDP20>
       <E1EDP19 SEGMENT="1">
         <QUALF>001</QUALF>
         <IDTNR>12345678</IDTNR>
Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender/Verzend/Test.cls.xml
===================================================================
diff -u -r35247 -r35430
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender/Verzend/Test.cls.xml	(.../Test.cls.xml)	(revision 35247)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender/Verzend/Test.cls.xml	(.../Test.cls.xml)	(revision 35430)
@@ -111,10 +111,11 @@
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<PEINH>100</PEINH>"),"")
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<NETWR>6.96</NETWR>"),"")
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<PREIS>11.6</PREIS>"),"")
-	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<E1EDP03 SEGMENT=""1"">"),"")
-	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<IDDAT>002</IDDAT>"),"")
-	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<DATUM>20121214</DATUM>"),"")
-	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"</E1EDP03>"),"")
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<E1EDP20 SEGMENT=""1"">"),"")
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<AMENG>0.000</AMENG>"),"")
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<WMENG>500.</WMENG>"),"")
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<EDATU>20121214</EDATU>"),"")
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"</E1EDP20>"),"")
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<E1EDP19 SEGMENT=""1"">"),"")
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<QUALF>001</QUALF>"),"")
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<IDTNR>12345678</IDTNR>"),"")
@@ -145,10 +146,11 @@
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<PEINH>100</PEINH>"),"")
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<NETWR>6.96</NETWR>"),"")
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<PREIS>11.6</PREIS>"),"")
-	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<E1EDP03 SEGMENT=""1"">"),"")
-	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<IDDAT>002</IDDAT>"),"")
-	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<DATUM>20121214</DATUM>"),"")
-	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"</E1EDP03>"),"")
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<E1EDP20 SEGMENT=""1"">"),"")
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<AMENG>0.000</AMENG>"),"")
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<WMENG>500.</WMENG>"),"")
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<EDATU>20121214</EDATU>"),"")
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"</E1EDP20>"),"")
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<E1EDP19 SEGMENT=""1"">"),"")
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<QUALF>001</QUALF>"),"")
 	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream,"<IDTNR>12345678</IDTNR>"),"")
Index: vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/XML/ORDERS05.cls.xml
===================================================================
diff -u -r35429 -r35430
--- vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/XML/ORDERS05.cls.xml	(.../ORDERS05.cls.xml)	(revision 35429)
+++ vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/XML/ORDERS05.cls.xml	(.../ORDERS05.cls.xml)	(revision 35430)
@@ -102,10 +102,11 @@
 	Set E1EDP01.NETWR = 6.96 ;##Position value##
 	Set E1EDP01.PREIS = 11.6 ;##gross price##
 	
-	Set E1EDP01.E1EDP03.SEGMENT = "1"
-	Set E1EDP01.E1EDP03.DATUM = "20121214"
-	Set E1EDP01.E1EDP03.IDDAT = "002" ; ### (expected delivery date)###
-	
+	Set E1EDP01.E1EDP20.SEGMENT = "1"
+	Set E1EDP01.E1EDP20.EDATU = "20121214"
+	Set E1EDP01.E1EDP20.AMENG = "0.000"
+	Set E1EDP01.E1EDP20.WMENG = "500."
+
 	Set E1EDP01.E1EDPT1.SEGMENT = "1"
 	Set E1EDP01.E1EDPT1.TDID = "004"
 	Set E1EDP01.E1EDPT1.E1EDPT2.TDLINE = "Positionstext ##Position Text##"