Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/Service/PostMessage001.txt
===================================================================
diff -u -r63229 -r63450
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/Service/PostMessage001.txt	(.../PostMessage001.txt)	(revision 63229)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/Service/PostMessage001.txt	(.../PostMessage001.txt)	(revision 63450)
@@ -17,7 +17,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ORDER_EDI>
   <EDI_NUMBER>VHTST1</EDI_NUMBER>
-  <DELIVERY>2021-01-14</DELIVERY>
+  <DELIVERY>2021-12-22</DELIVERY>
   <CUSTOMER_ORDERREF>OrderReferentie</CUSTOMER_ORDERREF>
   <CUSTOMER_ID>123456</CUSTOMER_ID>
   <CUSTOMER_NAME>Alpnach Norm - Schrankelemente AG (147432/123456/2402)</CUSTOMER_NAME>
Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/XmlExport/Offerte.xml
===================================================================
diff -u -r63229 -r63450
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/XmlExport/Offerte.xml	(.../Offerte.xml)	(revision 63229)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/XmlExport/Offerte.xml	(.../Offerte.xml)	(revision 63450)
@@ -8,8 +8,8 @@
       <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
     </Referentie>
     <LeveringDetail>
-      <Datum>2021-01-14</Datum>
-      <WensDatum>2020.12.17</WensDatum>
+      <Datum>2021-12-22</Datum>
+      <WensDatum>2021.12.22</WensDatum>
       <Adres>
         <ID></ID>
         <Naam></Naam>
@@ -231,8 +231,8 @@
         <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
       </Referentie>
       <LeveringDetail>
-        <Datum>2021-01-14</Datum>
-        <WensDatum>2020.12.17</WensDatum>
+        <Datum>2021-12-22</Datum>
+        <WensDatum>2021.12.22</WensDatum>
         <Adres>
           <ID></ID>
           <Naam>SFS UNIMARKET</Naam>
Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/Service/DoorbesteldeOfferte.xml
===================================================================
diff -u -r63229 -r63450
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/Service/DoorbesteldeOfferte.xml	(.../DoorbesteldeOfferte.xml)	(revision 63229)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/Service/DoorbesteldeOfferte.xml	(.../DoorbesteldeOfferte.xml)	(revision 63450)
@@ -8,8 +8,8 @@
       <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
     </Referentie>
     <LeveringDetail>
-      <Datum>2021-01-14</Datum>
-      <WensDatum>2020.12.17</WensDatum>
+      <Datum>2021-12-22</Datum>
+      <WensDatum>2021.12.22</WensDatum>
       <Adres>
         <ID></ID>
         <Naam>SFS UNIMARKET</Naam>
Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/XmlExport/DoorbesteldeOfferte.xml
===================================================================
diff -u -r63229 -r63450
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/XmlExport/DoorbesteldeOfferte.xml	(.../DoorbesteldeOfferte.xml)	(revision 63229)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/XmlExport/DoorbesteldeOfferte.xml	(.../DoorbesteldeOfferte.xml)	(revision 63450)
@@ -8,8 +8,8 @@
       <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
     </Referentie>
     <LeveringDetail>
-      <Datum>2021-01-14</Datum>
-      <WensDatum>2020.12.17</WensDatum>
+      <Datum>2021-12-22</Datum>
+      <WensDatum>2021.12.22</WensDatum>
       <Adres>
         <ID></ID>
         <Naam>SFS UNIMARKET</Naam>
Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/Service/Offerte.xml
===================================================================
diff -u -r63229 -r63450
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/Service/Offerte.xml	(.../Offerte.xml)	(revision 63229)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/Service/Offerte.xml	(.../Offerte.xml)	(revision 63450)
@@ -8,8 +8,8 @@
       <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
     </Referentie>
     <LeveringDetail>
-      <Datum>2021-01-14</Datum>
-      <WensDatum>2020.12.17</WensDatum>
+      <Datum>2021-12-22</Datum>
+      <WensDatum>2021.12.22</WensDatum>
       <Adres>
         <ID></ID>
         <Naam></Naam>
@@ -231,8 +231,8 @@
         <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
       </Referentie>
       <LeveringDetail>
-        <Datum>2021-01-14</Datum>
-        <WensDatum>2020.12.17</WensDatum>
+        <Datum>2021-12-22</Datum>
+        <WensDatum>2021.12.22</WensDatum>
         <Adres>
           <ID></ID>
           <Naam>SFS UNIMARKET</Naam>
Index: vhTest/Utils/EXT/Unishop/PurchaseOrder001/CreateOrder/Order.cls.xml
===================================================================
diff -u -r62963 -r63450
--- vhTest/Utils/EXT/Unishop/PurchaseOrder001/CreateOrder/Order.cls.xml	(.../Order.cls.xml)	(revision 62963)
+++ vhTest/Utils/EXT/Unishop/PurchaseOrder001/CreateOrder/Order.cls.xml	(.../Order.cls.xml)	(revision 63450)
@@ -29,7 +29,8 @@
 	Set Order.OrderReferentie = "OrderReferentie"
 	Set Order.KlantOrderNummer = "KlantOrderNummer"
 	Set Order.CommissieReferentie = "CommissieReferentie"
-	Set Order.GevraagdeLeverdatum = "2020.12.17"
+	Set LaatsteLeverdatumSfsVoorKalenderjaar = "2021.12.22"
+	Set Order.GevraagdeLeverdatum = LaatsteLeverdatumSfsVoorKalenderjaar
 	
 	If (LijnAantalTAX > 0) {
 		Set Lijn = ##class(EXT.Unishop.PurchaseOrder001.CreateOrder.OrderLijn).%New()
Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/XmlExport/PostMessage001.txt
===================================================================
diff -u -r63229 -r63450
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/XmlExport/PostMessage001.txt	(.../PostMessage001.txt)	(revision 63229)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service.SFS/TestTAXLBX/XmlExport/PostMessage001.txt	(.../PostMessage001.txt)	(revision 63450)
@@ -17,7 +17,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ORDER_EDI>
   <EDI_NUMBER>VHTST1</EDI_NUMBER>
-  <DELIVERY>2021-01-14</DELIVERY>
+  <DELIVERY>2021-12-22</DELIVERY>
   <CUSTOMER_ORDERREF>OrderReferentie</CUSTOMER_ORDERREF>
   <CUSTOMER_ID>123456</CUSTOMER_ID>
   <CUSTOMER_NAME>Alpnach Norm - Schrankelemente AG (147432/123456/2402)</CUSTOMER_NAME>