Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/XmlImport/Alpnach.xml
===================================================================
diff -u -r32533 -r32535
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/XmlImport/Alpnach.xml	(.../Alpnach.xml)	(revision 32533)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/XmlImport/Alpnach.xml	(.../Alpnach.xml)	(revision 32535)
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PurchaseOrders xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<PurchaseOrder>
-		<PurchaseOrderNumber>EDI000001</PurchaseOrderNumber>
+		<PurchaseOrderCommissionReference>CommissieReferentie</PurchaseOrderCommissionReference>
+		<PurchaseOrderNumber>KlantOrderNummer</PurchaseOrderNumber>
 		<PurchaseOrderReference>OrderReferentie</PurchaseOrderReference>
 		<RequestedDeliveryDate>01/01/2020</RequestedDeliveryDate>
 		<PurchaseOrderLines>
Index: APPS/EC/impl/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r32319 -r32535
--- APPS/EC/impl/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 32319)
+++ APPS/EC/impl/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 32535)
@@ -211,6 +211,7 @@
 		
 	Set Offerte.BestelOpmerking = ..GeefOpgekuisteTekst(Hoofding.BestelOpmerking)
 	Set Offerte.DocumentReferenties.OrderReferentie = ..GeefOpgekuisteTekst(Hoofding.Referentie.OrderReferentie)
+	Set Offerte.DocumentReferenties.KlantOrderNummer = ..GeefOpgekuisteTekst(Hoofding.Referentie.KlantOrderNummer)
 	Set Offerte.DocumentReferenties.CommissieReferentie = ..GeefOpgekuisteTekst(Hoofding.Referentie.CommissieReferentie)
 	
 	Do Offerte.Save()
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrderService001.Service.txt
===================================================================
diff -u -r32534 -r32535
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrderService001.Service.txt	(.../EXT.Unishop.PurchaseOrderService001.Service.txt)	(revision 32534)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrderService001.Service.txt	(.../EXT.Unishop.PurchaseOrderService001.Service.txt)	(revision 32535)
@@ -26,6 +26,7 @@
                         <s:sequence>
                             <s:element minOccurs="0" name="PurchaseOrderNumber" type="s0:String"/>
                             <s:element minOccurs="0" name="PurchaseOrderReference" type="s0:String"/>
+                            <s:element minOccurs="0" name="PurchaseOrderCommissionReference" type="s0:String"/>
                             <s:element minOccurs="0" name="RequestedDeliveryDate" type="s0:String"/>
                             <s:element minOccurs="0" name="Buyer" type="s0:Buyer"/>
                             <s:element minOccurs="0" name="Vendor" type="s0:Vendor"/>
Index: vhTest/Integratie/Unishop/PurchaseOrderService001/Service/Test.cls.xml
===================================================================
diff -u -r32533 -r32535
--- vhTest/Integratie/Unishop/PurchaseOrderService001/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 32533)
+++ vhTest/Integratie/Unishop/PurchaseOrderService001/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 32535)
@@ -96,7 +96,8 @@
 	set Request.Merkteken = "3}Z7Mb-(8aP*P/[]"
 	
 	set Request.Order.OrderReferentie = "OrderReferentie"
-	set Request.Order.EdiNummer = "EDI000001"
+	set Request.Order.KlantOrderNummer = "KlantOrderNummer"
+	set Request.Order.CommissieReferentie = "CommissieReferentie"
 	set Request.Order.GevraagdeLeverdatum = "01/01/2020"
 	
 	set Lijn = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.OrderLijn).%New()
Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/XmlExport/Offerte.xml
===================================================================
diff -u -r32533 -r32535
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/XmlExport/Offerte.xml	(.../Offerte.xml)	(revision 32533)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/XmlExport/Offerte.xml	(.../Offerte.xml)	(revision 32535)
@@ -4,7 +4,8 @@
   <Hoofding>
     <Referentie>
       <OrderReferentie>OrderReferentie</OrderReferentie>
-      <CommissieReferentie>EDI000001</CommissieReferentie>
+      <CommissieReferentie>CommissieReferentie</CommissieReferentie>
+      <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
     </Referentie>
     <LeveringDetail>
       <WensDatum>01/01/2020</WensDatum>
@@ -117,7 +118,8 @@
     <Hoofding>
       <Referentie>
         <OrderReferentie>OrderReferentie</OrderReferentie>
-        <CommissieReferentie>EDI000001, Alpnach Norm - Schrankelemente AG (147432/83723/2402)</CommissieReferentie>
+        <CommissieReferentie>CommissieReferentie, Alpnach Norm - Schrankelemente AG (147432/83723/2402)</CommissieReferentie>
+        <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
       </Referentie>
       <LeveringDetail>
         <Adres>
Index: APPS/EDI/Bestel/BestelService/PlaatsBestelling/Order.cls.xml
===================================================================
diff -u -r32215 -r32535
--- APPS/EDI/Bestel/BestelService/PlaatsBestelling/Order.cls.xml	(.../Order.cls.xml)	(revision 32215)
+++ APPS/EDI/Bestel/BestelService/PlaatsBestelling/Order.cls.xml	(.../Order.cls.xml)	(revision 32535)
@@ -7,14 +7,18 @@
 <Default>PurchaseOrder</Default>
 </Parameter>
 
-<Property name="EdiNummer">
+<Property name="KlantOrderNummer">
 <Type>TECH.String</Type>
 </Property>
 
 <Property name="OrderReferentie">
 <Type>TECH.String</Type>
 </Property>
 
+<Property name="CommissieReferentie">
+<Type>TECH.String</Type>
+</Property>
+
 <Property name="GevraagdeLeverdatum">
 <Description>
 Datumformaat is YYYY.MM.DD</Description>
@@ -34,6 +38,32 @@
 <Collection>list</Collection>
 <Required>1</Required>
 </Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>OrderState</State>
+<Data name="OrderState">
+<Subscript>"Order"</Subscript>
+<Value name="1">
+<Value>KlantOrderNummer</Value>
+</Value>
+<Value name="2">
+<Value>OrderReferentie</Value>
+</Value>
+<Value name="3">
+<Value>GevraagdeLeverdatum</Value>
+</Value>
+<Value name="4">
+<Value>Aankoper</Value>
+</Value>
+<Value name="5">
+<Value>Verkoper</Value>
+</Value>
+<Value name="6">
+<Value>Lijnen</Value>
+</Value>
+</Data>
+</Storage>
 </Class>
 
 
Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/XmlExport/DoorbesteldeOfferte.xml
===================================================================
diff -u -r32533 -r32535
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/XmlExport/DoorbesteldeOfferte.xml	(.../DoorbesteldeOfferte.xml)	(revision 32533)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/XmlExport/DoorbesteldeOfferte.xml	(.../DoorbesteldeOfferte.xml)	(revision 32535)
@@ -4,7 +4,8 @@
   <Hoofding>
     <Referentie>
       <OrderReferentie>OrderReferentie</OrderReferentie>
-      <CommissieReferentie>EDI000001, Alpnach Norm - Schrankelemente AG (147432/83723/2402)</CommissieReferentie>
+      <CommissieReferentie>CommissieReferentie, Alpnach Norm - Schrankelemente AG (147432/83723/2402)</CommissieReferentie>
+      <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
     </Referentie>
     <LeveringDetail>
       <Adres>
Index: APPS/EDI/Bestel/impl/BestelService.cls.xml
===================================================================
diff -u -r32480 -r32535
--- APPS/EDI/Bestel/impl/BestelService.cls.xml	(.../BestelService.cls.xml)	(revision 32480)
+++ APPS/EDI/Bestel/impl/BestelService.cls.xml	(.../BestelService.cls.xml)	(revision 32535)
@@ -63,7 +63,8 @@
 <Implementation><![CDATA[
 	set OfferteHoofding = ##class(APPS.EC.dto.Hoofding).%New()
 	set OfferteHoofding.Referentie.OrderReferentie = Order.OrderReferentie
-	set OfferteHoofding.Referentie.CommissieReferentie = Order.EdiNummer
+	set OfferteHoofding.Referentie.KlantOrderNummer = Order.KlantOrderNummer
+	set OfferteHoofding.Referentie.CommissieReferentie = Order.CommissieReferentie
 	set OfferteHoofding.LeveringDetail.WensDatum = Order.GevraagdeLeverdatum
 	do ..ExterneVerkoopService.ZetOfferteHoofding(OfferteID,OfferteHoofding)
 ]]></Implementation>
Index: APPS/EC/impl/ExterneVerkoopService/OfferteHerberekening.cls.xml
===================================================================
diff -u -r29059 -r32535
--- APPS/EC/impl/ExterneVerkoopService/OfferteHerberekening.cls.xml	(.../OfferteHerberekening.cls.xml)	(revision 29059)
+++ APPS/EC/impl/ExterneVerkoopService/OfferteHerberekening.cls.xml	(.../OfferteHerberekening.cls.xml)	(revision 32535)
@@ -148,6 +148,7 @@
 	Set Hoofding.Referentie = ##class(APPS.VKP.dto.DocumentReferenties).%New()
 	Set Hoofding.Referentie.OrderReferentie = Offerte.DocumentReferenties.OrderReferentie
 	Set Hoofding.Referentie.CommissieReferentie = Offerte.DocumentReferenties.CommissieReferentie
+	Set Hoofding.Referentie.KlantOrderNummer = Offerte.DocumentReferenties.KlantOrderNummer
 	Set Hoofding.LeveringDetail = ##class(APPS.EC.dto.LeveringDetail).%New()
 	
 	If ($isObject(Offerte.GeefLeverAdres())) {
Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/Service/DoorbesteldeOfferte.xml
===================================================================
diff -u -r32532 -r32535
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/Service/DoorbesteldeOfferte.xml	(.../DoorbesteldeOfferte.xml)	(revision 32532)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/Service/DoorbesteldeOfferte.xml	(.../DoorbesteldeOfferte.xml)	(revision 32535)
@@ -4,7 +4,8 @@
   <Hoofding>
     <Referentie>
       <OrderReferentie>OrderReferentie</OrderReferentie>
-      <CommissieReferentie>EDI000001, Alpnach Norm - Schrankelemente AG (147432/83723/2402)</CommissieReferentie>
+      <CommissieReferentie>CommissieReferentie, Alpnach Norm - Schrankelemente AG (147432/83723/2402)</CommissieReferentie>
+      <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
     </Referentie>
     <LeveringDetail>
       <Adres>
Index: EXT/Unishop/PurchaseOrderService001/CreateOrder/Order.cls.xml
===================================================================
diff -u -r32274 -r32535
--- EXT/Unishop/PurchaseOrderService001/CreateOrder/Order.cls.xml	(.../Order.cls.xml)	(revision 32274)
+++ EXT/Unishop/PurchaseOrderService001/CreateOrder/Order.cls.xml	(.../Order.cls.xml)	(revision 32535)
@@ -11,7 +11,7 @@
 <Default>PurchaseOrder</Default>
 </Parameter>
 
-<Property name="EdiNummer">
+<Property name="KlantOrderNummer">
 <Type>TECH.String</Type>
 <Parameter name="XMLNAME" value="PurchaseOrderNumber"/>
 </Property>
@@ -21,6 +21,11 @@
 <Parameter name="XMLNAME" value="PurchaseOrderReference"/>
 </Property>
 
+<Property name="CommissieReferentie">
+<Type>TECH.String</Type>
+<Parameter name="XMLNAME" value="PurchaseOrderCommissionReference"/>
+</Property>
+
 <Property name="GevraagdeLeverdatum">
 <Description>
 Datumformaat is YYYY.MM.DD</Description>
@@ -54,7 +59,7 @@
 <Data name="OrderState">
 <Subscript>"Order"</Subscript>
 <Value name="1">
-<Value>EdiNummer</Value>
+<Value>KlantOrderNummer</Value>
 </Value>
 <Value name="2">
 <Value>OrderReferentie</Value>
@@ -71,6 +76,9 @@
 <Value name="6">
 <Value>Lijnen</Value>
 </Value>
+<Value name="7">
+<Value>CommissieReferentie</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/Service/Offerte.xml
===================================================================
diff -u -r32532 -r32535
--- vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/Service/Offerte.xml	(.../Offerte.xml)	(revision 32532)
+++ vhTestFiles/IntegratieTests/Unishop.PurchaseOrderService001.Service/Test/Service/Offerte.xml	(.../Offerte.xml)	(revision 32535)
@@ -4,7 +4,8 @@
   <Hoofding>
     <Referentie>
       <OrderReferentie>OrderReferentie</OrderReferentie>
-      <CommissieReferentie>EDI000001</CommissieReferentie>
+      <CommissieReferentie>CommissieReferentie</CommissieReferentie>
+      <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
     </Referentie>
     <LeveringDetail>
       <WensDatum>01/01/2020</WensDatum>
@@ -117,7 +118,8 @@
     <Hoofding>
       <Referentie>
         <OrderReferentie>OrderReferentie</OrderReferentie>
-        <CommissieReferentie>EDI000001, Alpnach Norm - Schrankelemente AG (147432/83723/2402)</CommissieReferentie>
+        <CommissieReferentie>CommissieReferentie, Alpnach Norm - Schrankelemente AG (147432/83723/2402)</CommissieReferentie>
+        <KlantOrderNummer>KlantOrderNummer</KlantOrderNummer>
       </Referentie>
       <LeveringDetail>
         <Adres>