Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test013AantalPickingbladEnVoormontageVerschillend/StartBatch/15000_0001.xml
===================================================================
diff -u -r74351 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test013AantalPickingbladEnVoormontageVerschillend/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74351)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test013AantalPickingbladEnVoormontageVerschillend/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -9493,10 +9493,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -9506,6 +9506,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test003/StartBatch/15000_0001.xml
===================================================================
diff -u -r74310 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test003/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74310)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test003/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -613,10 +613,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -626,6 +626,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test016SpoelbakMetMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r74322 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test016SpoelbakMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74322)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test016SpoelbakMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -643,10 +643,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -656,6 +656,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestLBXFree/StartBatch/15000_0001.xml
===================================================================
diff -u -r74367 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestLBXFree/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74367)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestLBXFree/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1913,10 +1913,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1926,6 +1926,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSifonladeEnkeleUitsparing/StartBatch/15000_0001.xml
===================================================================
diff -u -r74358 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSifonladeEnkeleUitsparing/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74358)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSifonladeEnkeleUitsparing/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -2038,10 +2038,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -2051,6 +2051,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002Lijn3/StartBatch/15000_0001.xml
===================================================================
diff -u -r74367 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002Lijn3/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74367)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002Lijn3/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -2963,10 +2963,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -2976,6 +2976,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSmalleLade/StartBatch/15000_0001.xml
===================================================================
diff -u -r74309 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSmalleLade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74309)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSmalleLade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1883,10 +1883,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1896,6 +1896,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test014EnkeleSifonlade/StartBatch/15000_0001.xml
===================================================================
diff -u -r74308 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test014EnkeleSifonlade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74308)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test014EnkeleSifonlade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -718,10 +718,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -731,6 +731,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test014MetGekoppeldeMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test014MetGekoppeldeMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test014MetGekoppeldeMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -4258,10 +4258,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -4271,6 +4271,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test011/StartBatch/15000_0001.xml
===================================================================
diff -u -r74383 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test011/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74383)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test011/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -718,10 +718,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -731,6 +731,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test022DubbeleSifonladeMetMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r74370 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test022DubbeleSifonladeMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74370)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test022DubbeleSifonladeMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -793,10 +793,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -806,6 +806,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetDwarsverdeling/StartBatch/15000_0001.xml
===================================================================
diff -u -r74378 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetDwarsverdeling/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74378)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetDwarsverdeling/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1613,10 +1613,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1626,6 +1626,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0002.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 74391)
@@ -738,10 +738,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>333333</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00002</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -751,6 +751,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestStandaardLade/StartBatch/15000_0001.xml
===================================================================
diff -u -r74309 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestStandaardLade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74309)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestStandaardLade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1323,10 +1323,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1336,6 +1336,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test021VHossVerpakking/StartBatch/15000_0001.xml
===================================================================
diff -u -r74344 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test021VHossVerpakking/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74344)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test021VHossVerpakking/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -2608,10 +2608,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -2621,6 +2621,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test017SpoelbakVerpakkingVhoss/StartBatch/15000_0001.xml
===================================================================
diff -u -r74310 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test017SpoelbakVerpakkingVhoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74310)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test017SpoelbakVerpakkingVhoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -523,10 +523,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -536,6 +536,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test009/StartBatch/15000_0001.xml
===================================================================
diff -u -r74344 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test009/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74344)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test009/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -838,10 +838,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -851,6 +851,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml
===================================================================
diff -u -r74347 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74347)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -553,10 +553,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -566,6 +566,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test009/StartBatch/15000_0001.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test009/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test009/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -828,10 +828,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -841,6 +841,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0003.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0003.xml	(.../15000_0003.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0003.xml	(.../15000_0003.xml)	(revision 74391)
@@ -1313,10 +1313,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222223</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00003</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1326,6 +1326,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetBoxcover/StartBatch/15000_0001.xml
===================================================================
diff -u -r74309 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetBoxcover/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74309)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetBoxcover/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -773,10 +773,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -786,6 +786,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test004/StartBatch/15000_0001.xml
===================================================================
diff -u -r74310 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test004/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74310)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test004/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -703,10 +703,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -716,6 +716,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test022PalletVerpakking/StartBatch/15000_0001.xml
===================================================================
diff -u -r74344 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test022PalletVerpakking/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74344)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test022PalletVerpakking/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -2743,10 +2743,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -2756,6 +2756,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test001/StartBatch/15000_0001.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test001/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test001/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1358,10 +1358,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1371,6 +1371,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSifonladeDubbeleUitsparingMetMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r74358 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSifonladeDubbeleUitsparingMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74358)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSifonladeDubbeleUitsparingMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1603,10 +1603,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1616,6 +1616,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test006/StartBatch/15000_0001.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test006/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test006/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1443,10 +1443,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1456,6 +1456,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSpoelbaklade/StartBatch/15000_0001.xml
===================================================================
diff -u -r74309 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSpoelbaklade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74309)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestSpoelbaklade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -838,10 +838,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -851,6 +851,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0002.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 74391)
@@ -698,10 +698,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222224</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00002</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -711,6 +711,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test013Spoelbaklade/StartBatch/15000_0001.xml
===================================================================
diff -u -r74385 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test013Spoelbaklade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74385)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test013Spoelbaklade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1053,10 +1053,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1066,6 +1066,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml
===================================================================
diff -u -r74355 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74355)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -558,10 +558,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -571,6 +571,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002/StartBatch/15000_0001.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -2363,10 +2363,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -2376,6 +2376,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test001/StartBatch/15000_0001.xml
===================================================================
diff -u -r74385 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test001/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74385)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test001/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -733,10 +733,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -746,6 +746,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0001.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -2363,10 +2363,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -2376,6 +2376,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test021MetGekoppeldeSpaceStep/StartBatch/15000_0001.xml
===================================================================
diff -u -r74365 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test021MetGekoppeldeSpaceStep/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74365)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test021MetGekoppeldeSpaceStep/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1868,10 +1868,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1881,6 +1881,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetAfdekkapRugwandHouders/StartBatch/15000_0001.xml
===================================================================
diff -u -r74309 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetAfdekkapRugwandHouders/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74309)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetAfdekkapRugwandHouders/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -788,10 +788,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -801,6 +801,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test008/StartBatch/15000_0001.xml
===================================================================
diff -u -r74308 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test008/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74308)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test008/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -713,10 +713,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -726,6 +726,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetBewerkteZijstabilisering/StartBatch/15000_0001.xml
===================================================================
diff -u -r74309 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetBewerkteZijstabilisering/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74309)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetBewerkteZijstabilisering/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1408,10 +1408,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1421,6 +1421,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test020LadeMetDwarsverdeling/StartBatch/15000_0001.xml
===================================================================
diff -u -r74344 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test020LadeMetDwarsverdeling/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74344)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test020LadeMetDwarsverdeling/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -763,10 +763,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -776,6 +776,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test023CFMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r74333 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test023CFMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74333)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test023CFMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1453,10 +1453,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222221</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1466,6 +1466,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0001.xml
===================================================================
diff -u -r74322 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74322)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -713,10 +713,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -726,6 +726,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestPallet/StartBatch/15000_0001.xml
===================================================================
diff -u -r74309 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestPallet/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74309)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestPallet/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -713,10 +713,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -726,6 +726,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test011/StartBatch/15000_0001.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test011/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test011/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -843,10 +843,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -856,6 +856,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestInbegrepenAfdekkappenFronthouder/StartBatch/15000_0001.xml
===================================================================
diff -u -r74350 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestInbegrepenAfdekkappenFronthouder/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74350)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestInbegrepenAfdekkappenFronthouder/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -628,10 +628,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -641,6 +641,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0002.xml
===================================================================
diff -u -r74380 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 74380)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 74391)
@@ -4228,10 +4228,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00002</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -4241,6 +4241,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetVeelExtras/StartBatch/15000_0001.xml
===================================================================
diff -u -r74344 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetVeelExtras/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74344)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetVeelExtras/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -863,10 +863,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -876,6 +876,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestSifon/StartBatch/15000_0001.xml
===================================================================
diff -u -r74389 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestSifon/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74389)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestSifon/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -2698,10 +2698,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -2711,6 +2711,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestBinnenlade/StartBatch/15000_0001.xml
===================================================================
diff -u -r74344 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestBinnenlade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74344)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestBinnenlade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -2073,10 +2073,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -2086,6 +2086,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestProductiewijzeFront/StartBatch/15000_0001.xml
===================================================================
diff -u -r74355 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestProductiewijzeFront/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74355)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestProductiewijzeFront/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -553,10 +553,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -566,6 +566,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test017DubbeleSifonladeMetGekoppeldeMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r74364 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test017DubbeleSifonladeMetGekoppeldeMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74364)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test017DubbeleSifonladeMetGekoppeldeMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -808,10 +808,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -821,6 +821,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0001.xml
===================================================================
diff -u -r74380 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74380)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -1528,10 +1528,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222221</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -1541,6 +1541,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test010/StartBatch/15000_0001.xml
===================================================================
diff -u -r74344 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test010/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74344)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test010/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -903,10 +903,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -916,6 +916,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test015DubbeleSifonlade/StartBatch/15000_0001.xml
===================================================================
diff -u -r74333 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test015DubbeleSifonlade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74333)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test015DubbeleSifonlade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -738,10 +738,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -751,6 +751,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetNietBewerkteZijstabilisering/StartBatch/15000_0001.xml
===================================================================
diff -u -r74309 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetNietBewerkteZijstabilisering/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74309)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestLadeMetNietBewerkteZijstabilisering/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -843,10 +843,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -856,6 +856,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestDesignZijkant/StartBatch/15000_0001.xml
===================================================================
diff -u -r74310 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestDesignZijkant/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74310)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestDesignZijkant/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -4458,10 +4458,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -4471,6 +4471,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test019StalenRug/StartBatch/15000_0001.xml
===================================================================
diff -u -r74308 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test019StalenRug/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74308)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test019StalenRug/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -633,10 +633,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -646,6 +646,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test007/StartBatch/15000_0001.xml
===================================================================
diff -u -r74310 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test007/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74310)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test007/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -5573,10 +5573,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>235887</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -5586,6 +5586,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestVHoss/StartBatch/15000_0001.xml
===================================================================
diff -u -r74309 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestVHoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74309)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestVHoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -653,10 +653,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -666,6 +666,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test005/StartBatch/15000_0001.xml
===================================================================
diff -u -r74350 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test005/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74350)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test005/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -2418,10 +2418,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>235887</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -2431,6 +2431,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestProductiewijzeBodem/StartBatch/15000_0001.xml
===================================================================
diff -u -r74355 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestProductiewijzeBodem/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74355)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Merivobox.Aansturing/TestProductiewijzeBodem/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -488,10 +488,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -501,6 +501,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test016/StartBatch/15000_0001.xml
===================================================================
diff -u -r74308 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test016/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74308)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test016/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -728,10 +728,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -741,6 +741,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test010MetVHoss/StartBatch/15000_0001.xml
===================================================================
diff -u -r74345 -r74391
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test010MetVHoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74345)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test010MetVHoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 74391)
@@ -20313,10 +20313,10 @@
     <numeric></numeric>
     <text>
       <vh-mes-production-plugin_supplynr>222222</vh-mes-production-plugin_supplynr>
-      <vh-mes-production-plugin_batchsequence>200_00001</vh-mes-production-plugin_batchsequence>
+      <vh-mes-production-plugin_batchsequence></vh-mes-production-plugin_batchsequence>
       <vh-mes-production-plugin_batchnr>15000</vh-mes-production-plugin_batchnr>
       <vh-mes-production-plugin_salesorderid>null</vh-mes-production-plugin_salesorderid>
-      <vh-mes-production-plugin_productionline>1</vh-mes-production-plugin_productionline>
+      <vh-mes-production-plugin_productionline></vh-mes-production-plugin_productionline>
       <vh-mes-production-plugin_orderreference>null</vh-mes-production-plugin_orderreference>
       <vh-mes-production-plugin_commissionreference>null</vh-mes-production-plugin_commissionreference>
       <vh-mes-production-plugin_customerordernr>null</vh-mes-production-plugin_customerordernr>
@@ -20326,6 +20326,8 @@
       <vh-mes-production-plugin_customernr>00010</vh-mes-production-plugin_customernr>
       <vh-mes-production-plugin_customerlanguage>N</vh-mes-production-plugin_customerlanguage>
       <vh-mes-production-plugin_deliveryname>null</vh-mes-production-plugin_deliveryname>
+      <vh-mes-production-plugin_deliveryaddress></vh-mes-production-plugin_deliveryaddress>
+      <vh-mes-production-plugin_deliverycountry></vh-mes-production-plugin_deliverycountry>
       <vh-mes-production-plugin_mupcustomernr1>null</vh-mes-production-plugin_mupcustomernr1>
       <vh-mes-production-plugin_mupcustomernr2>null</vh-mes-production-plugin_mupcustomernr2>
       <vh-mes-production-plugin_palletmaterial>EUR</vh-mes-production-plugin_palletmaterial>