diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index e05c1f0edbef1dec24b8dbffb1399aa09732ba17..220abdbfca83f723e8f7bc6dc74d50421b4e500d 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -329,6 +329,7 @@
       <name>OfferId_param</name>
       <expose v="true" />
       <mandatory v="false" />
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/offerid_param/documentation.adoc</documentation>
       <description>PARAMETER</description>
     </entityParameter>
     <entityConsumer>
@@ -471,6 +472,7 @@
     </entityField>
     <entityField>
       <name>ORDERSTATUS</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/orderstatus/documentation.adoc</documentation>
       <title>Sent</title>
       <contentType>BOOLEAN</contentType>
       <dropDownProcess>%aditoprj%/entity/Order_entity/entityfields/orderstatus/dropDownProcess.js</dropDownProcess>
@@ -488,6 +490,7 @@
     </entityField>
     <entityField>
       <name>CANCELLATION</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/cancellation/documentation.adoc</documentation>
       <title>Cancelled</title>
       <contentType>BOOLEAN</contentType>
       <dropDownProcess>%aditoprj%/entity/Order_entity/entityfields/cancellation/dropDownProcess.js</dropDownProcess>
@@ -616,14 +619,19 @@
       <name>PossibleConnectionTypes</name>
       <valueProcess>%aditoprj%/entity/Order_entity/entityfields/possibleconnectiontypes/valueProcess.js</valueProcess>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityParameter>
       <name>ObjectRowId_param</name>
       <expose v="true" />
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/objectrowid_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
     </entityParameter>
     <entityParameter>
       <name>ObjectType_param</name>
       <expose v="true" />
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/objecttype_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
     </entityParameter>
     <entityField>
       <name>PAYMENTTERMS</name>
@@ -645,6 +653,7 @@
     </entityField>
     <entityField>
       <name>DELIVERYADDRESS</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/deliveryaddress/documentation.adoc</documentation>
       <title>Delivery address</title>
       <contentType>LONG_TEXT</contentType>
       <mandatory v="true" />
@@ -687,6 +696,7 @@
     </entityConsumer>
     <entityConsumer>
       <name>PossibleAddresses</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/possibleaddresses/documentation.adoc</documentation>
       <dependency>
         <name>dependency</name>
         <entityName>Address_entity</entityName>
@@ -706,6 +716,7 @@
     </entityField>
     <entityField>
       <name>DUNNINGTEXT</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/dunningtext/documentation.adoc</documentation>
       <title>Dunning text</title>
       <contentType>LONG_TEXT</contentType>
       <valueProcess>%aditoprj%/entity/Order_entity/entityfields/dunningtext/valueProcess.js</valueProcess>
@@ -713,10 +724,12 @@
     <entityParameter>
       <name>OrderPaymentTerm_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityParameter>
       <name>OrderDeliveryTerm_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityConsumer>
       <name>Offers</name>
@@ -781,14 +794,17 @@
     <entityParameter>
       <name>OrderFooter_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityParameter>
       <name>OrderDunningDate_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityParameter>
       <name>OrderDunningLevel_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityActionField>
       <name>TransferDeliveryNote</name>
@@ -801,6 +817,7 @@
     <entityParameter>
       <name>OrderType_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityActionField>
       <name>TransferInvoice</name>
@@ -829,6 +846,7 @@
     <entityParameter>
       <name>OrderCancellation_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityActionField>
       <name>setDunning</name>
@@ -848,9 +866,9 @@
     </entityActionField>
     <entityField>
       <name>ChosenPaymentAddress</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/chosenpaymentaddress/documentation.adoc</documentation>
       <title>Choose payment address</title>
       <consumer>PossibleAddresses</consumer>
-      <mandatory v="false" />
       <valueProcess>%aditoprj%/entity/Order_entity/entityfields/chosenpaymentaddress/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/chosenpaymentaddress/displayValueProcess.js</displayValueProcess>
       <onValueChange>%aditoprj%/entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js</onValueChange>
@@ -862,6 +880,7 @@
     </entityField>
     <entityField>
       <name>ChosenDeliveryAddress</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/chosendeliveryaddress/documentation.adoc</documentation>
       <title>Choose delivery address</title>
       <consumer>PossibleAddresses</consumer>
       <valueProcess>%aditoprj%/entity/Order_entity/entityfields/chosendeliveryaddress/valueProcess.js</valueProcess>
@@ -873,13 +892,10 @@
         <element>PROCESS_SETVALUE</element>
       </onValueChangeTypes>
     </entityField>
-    <entityParameter>
-      <name>Countitems_param</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/countitems_param/valueProcess.js</valueProcess>
-    </entityParameter>
     <entityParameter>
       <name>OrderCode_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityActionField>
       <name>printOrder</name>
@@ -892,10 +908,12 @@
     <entityParameter>
       <name>OrderStatus_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityParameter>
       <name>OrderVersnr_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityField>
       <name>FullOrderCode</name>
@@ -913,10 +931,14 @@
     <entityParameter>
       <name>OrderPaymentAddress_param</name>
       <expose v="true" />
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
     </entityParameter>
     <entityParameter>
       <name>OrderDeliveryAddress_param</name>
       <expose v="true" />
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
     </entityParameter>
   </entityFields>
   <recordContainers>
diff --git a/entity/Order_entity/entityfields/cancellation/documentation.adoc b/entity/Order_entity/entityfields/cancellation/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..576a39d48d5cd7c923f8bf377554c85d2917348d
--- /dev/null
+++ b/entity/Order_entity/entityfields/cancellation/documentation.adoc
@@ -0,0 +1 @@
+Checkbox if order is cancelled.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/chosendeliveryaddress/documentation.adoc b/entity/Order_entity/entityfields/chosendeliveryaddress/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..aef202e050b1df2fc1627edf2759b78b1925d918
--- /dev/null
+++ b/entity/Order_entity/entityfields/chosendeliveryaddress/documentation.adoc
@@ -0,0 +1 @@
+Field to choose a delivery address from the specified contact's current addresses. If a receipt is made from an offer the address is received from the offer. Otherwise the default company address is selected. Default is the same as the payment address, but can be changed. 
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/chosendeliveryaddress/valueProcess.js b/entity/Order_entity/entityfields/chosendeliveryaddress/valueProcess.js
index daa4e4fa28136844a29bb325170ac9bb6c35b80c..f0b227bdb4b0fe3afa8e9542ce9f10af4630d3b9 100644
--- a/entity/Order_entity/entityfields/chosendeliveryaddress/valueProcess.js
+++ b/entity/Order_entity/entityfields/chosendeliveryaddress/valueProcess.js
@@ -5,14 +5,20 @@ import("system.vars");
 
 if (((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null))
 {
-    if (vars.get("$field.DELIVERYADDRESS")) 
+    if (vars.get("$field.DELIVERYADDRESS")) //case when a receipt is made from an offer i.e. the address is already set
     {
     result.string(null);
     }
     else 
         {
-    var defaultAddressId = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID"));
+    var defaultAddressId = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID")); //otherwise get the default address
     if (defaultAddressId)
         result.string(defaultAddressId);
         }
 }
+else //(i.e this.value!=null)
+{
+ var defaultAddressId2 = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID")); //if the user changes the contact and project again, get the address of the new contact
+    if (defaultAddressId2)
+        result.string(defaultAddressId2);   
+}
diff --git a/entity/Order_entity/entityfields/chosenpaymentaddress/documentation.adoc b/entity/Order_entity/entityfields/chosenpaymentaddress/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..11fd3d5cad1e9395c952a8658ea3a20049bd9311
--- /dev/null
+++ b/entity/Order_entity/entityfields/chosenpaymentaddress/documentation.adoc
@@ -0,0 +1 @@
+Field to choose a payment address from the specified contact's current addresses. If a receipt is made from an offer the address is received from the offer. Otherwise the default company address is selected. 
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/chosenpaymentaddress/valueProcess.js b/entity/Order_entity/entityfields/chosenpaymentaddress/valueProcess.js
index 083eb6bf297264e03ee2cfa1207c3d858897dcef..5520b6f007660f1ce62e6216c5b587c5e3bbdaf6 100644
--- a/entity/Order_entity/entityfields/chosenpaymentaddress/valueProcess.js
+++ b/entity/Order_entity/entityfields/chosenpaymentaddress/valueProcess.js
@@ -5,14 +5,20 @@ import("system.vars");
 
 if (((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null))
 {
-    if (vars.get("$field.PAYMENTADDRESS")) 
+    if (vars.get("$field.PAYMENTADDRESS")) //case when a receipt is made from an offer i.e. the address is already set
     {
     result.string(null);
     }
     else 
         {
-    var defaultAddressId = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID"));
+    var defaultAddressId = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID")); //otherwise get the default address
     if (defaultAddressId)
         result.string(defaultAddressId);
         }
 }
+else //(i.e this.value!=null)
+{
+ var defaultAddressId2 = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID")); //if the user changes the contact and project again, get the address of the new contact
+    if (defaultAddressId2)
+        result.string(defaultAddressId2);   
+}
diff --git a/entity/Order_entity/entityfields/countitems_param/valueProcess.js b/entity/Order_entity/entityfields/countitems_param/valueProcess.js
deleted file mode 100644
index fc714e95d0903906495442940ca974d4be2b1b59..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/countitems_param/valueProcess.js
+++ /dev/null
@@ -1,15 +0,0 @@
-//import("system.result");
-//import("system.vars");
-//import("system.neon");
-//import("system.entities");
-//
-////var loadingConfig = entities.createConfigForLoadingConsumerRows().consumer("Orderitems");
-////var count = entities.getRowCount(loadingConfig);
-//
-//var conf = entities.createConfigForLoadingRows()
-//                   .entity("Orderitem_entity")
-//                   .provider("Orderitems")
-//                   .addParameter("ContactId_param", vars.get("$field.CONTACT_ID"));
-//                   
-//var count=entities.getRowCount(conf);                  
-//result.string(count);
diff --git a/entity/Order_entity/entityfields/deliveryaddress/documentation.adoc b/entity/Order_entity/entityfields/deliveryaddress/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..7f6c328fd9820983983a4870b4c976c65b5093c0
--- /dev/null
+++ b/entity/Order_entity/entityfields/deliveryaddress/documentation.adoc
@@ -0,0 +1 @@
+Normally it is the same as the Payment Address, but can be set as its own, if the delivery address does not match the payment address.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/dunningtext/documentation.adoc b/entity/Order_entity/entityfields/dunningtext/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..b955b05daebe3c8c47855fa1103583e2a65f5a1a
--- /dev/null
+++ b/entity/Order_entity/entityfields/dunningtext/documentation.adoc
@@ -0,0 +1 @@
+Displays the default set dunning text.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/objectrowid_param/documentation.adoc b/entity/Order_entity/entityfields/objectrowid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a64ca3b24b114356f3582280544f72e4b1359e67
--- /dev/null
+++ b/entity/Order_entity/entityfields/objectrowid_param/documentation.adoc
@@ -0,0 +1 @@
+Holds the project ID
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/objecttype_param/documentation.adoc b/entity/Order_entity/entityfields/objecttype_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..36587da9fc53ba751ad9a1a7f3e98d143242ca41
--- /dev/null
+++ b/entity/Order_entity/entityfields/objecttype_param/documentation.adoc
@@ -0,0 +1 @@
+Holds the object type. In this case it is sales project.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/offerid_param/documentation.adoc b/entity/Order_entity/entityfields/offerid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d746760ddb37571c1e6823c2ed701b705adec196
--- /dev/null
+++ b/entity/Order_entity/entityfields/offerid_param/documentation.adoc
@@ -0,0 +1 @@
+If the current receipt is linked with an offer, this parameter holds the ID.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc b/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..b50a32de3db59790cfb871c49c908778c8b43081
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc
@@ -0,0 +1 @@
+Carries the delivery address of the receipt. Can also be set from the offer if a receipt is to be created from a specified offer.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc b/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..43cd09315c3da6da4918fff7eac2d6c0108320db
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc
@@ -0,0 +1 @@
+Carries the main address of the receipt. Can also be set from the offer if a receipt is to be created from a specified offer.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderstatus/documentation.adoc b/entity/Order_entity/entityfields/orderstatus/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..107a230323bd287ed8cf0c35dfc8417298c4ff06
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderstatus/documentation.adoc
@@ -0,0 +1 @@
+Checkbox if order is sent.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/possibleaddresses/documentation.adoc b/entity/Order_entity/entityfields/possibleaddresses/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..657ff6bdced0279e33e5f4f420eb676c4e11eebb
--- /dev/null
+++ b/entity/Order_entity/entityfields/possibleaddresses/documentation.adoc
@@ -0,0 +1 @@
+Filters the addresses based on the company and sales project choice.
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 5113afa1cef9245d6b4641858bc0ccdd653e9d5f..3ae458ef427016ece64637c5e5b12f8d4ce96610 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -231,10 +231,12 @@
     <entityParameter>
       <name>OrderStatus_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
     <entityParameter>
       <name>Language_param</name>
       <expose v="true" />
+      <description>PARAMETER</description>
     </entityParameter>
   </entityFields>
   <recordContainers>