Merge branch 'Receipt' into 'master'

Receipt

See merge request xrm/basic!59

entity/Order_entity/Order_entity.aod

@@ -128,6 +128,7 @@
     </entityConsumer>
     <entityActionField>
       <name>newOrderVersion</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/neworderversion/documentation.adoc</documentation>
       <title>New receipt version</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/neworderversion/onActionProcess.js</onActionProcess>
       <isObjectAction v="true" />
@@ -160,6 +161,7 @@
     </entityField>
     <entityActionField>
       <name>newOrder</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/neworder/documentation.adoc</documentation>
       <title>Copy receipt</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:COPY</iconId>
@@ -191,6 +193,7 @@
       <name>ContactId_param</name>
       <expose v="true" />
       <mandatory v="true" />
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/contactid_param/documentation.adoc</documentation>
       <description>PARAMETER</description>
     </entityParameter>
     <entityField>
@@ -352,6 +355,7 @@
     </entityConsumer>
     <entityActionField>
       <name>newActivity</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/newactivity/documentation.adoc</documentation>
       <title>New activity</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:HOURGLASS_END</iconId>
@@ -369,6 +373,7 @@
     </entityField>
     <entityActionField>
       <name>newTask</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/newtask/documentation.adoc</documentation>
       <title>New task</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:TASKS</iconId>
@@ -514,6 +519,7 @@
     </entityField>
     <entityField>
       <name>PAYDUEDATE</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/payduedate/documentation.adoc</documentation>
       <title>Pay due date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
@@ -786,6 +792,7 @@
     </entityParameter>
     <entityActionField>
       <name>TransferDeliveryNote</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/transferdeliverynote/documentation.adoc</documentation>
       <title>Transfer to delivery note</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:NOTEBOOK</iconId>
@@ -797,6 +804,7 @@
     </entityParameter>
     <entityActionField>
       <name>TransferInvoice</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/transferinvoice/documentation.adoc</documentation>
       <title>Transfer to Invoice</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:BOOK_DOLLAR</iconId>
@@ -804,6 +812,7 @@
     </entityActionField>
     <entityActionField>
       <name>setSent</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/setsent/documentation.adoc</documentation>
       <title>Set to sent</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/setsent/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:ARROW_BACKWARD</iconId>
@@ -811,6 +820,7 @@
     </entityActionField>
     <entityActionField>
       <name>cancel</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/cancel/documentation.adoc</documentation>
       <title>Cancel</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/cancel/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:CLOSE</iconId>
@@ -822,6 +832,7 @@
     </entityParameter>
     <entityActionField>
       <name>setDunning</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/setdunning/documentation.adoc</documentation>
       <title>Set dunning</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/setdunning/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:WARNING</iconId>
@@ -829,6 +840,7 @@
     </entityActionField>
     <entityActionField>
       <name>setPaid</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/setpaid/documentation.adoc</documentation>
       <title>Set paid amount</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/setpaid/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:DOLLAR</iconId>
@@ -871,6 +883,7 @@
     </entityParameter>
     <entityActionField>
       <name>printOrder</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/printorder/documentation.adoc</documentation>
       <title>Print order</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/printorder/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:FILE</iconId>
@@ -891,6 +904,7 @@
     </entityField>
     <entityActionField>
       <name>printReminder</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/printreminder/documentation.adoc</documentation>
       <title>Print reminder</title>
       <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/printreminder/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:FILE</iconId>

entity/Order_entity/documentation.adoc

@@ -5,20 +5,22 @@
 Entity contains meta data of the Order module.
 It provides data from database table _SALESORDER_.
 
-== Actions
-
-* _Copy order_: All values, orderitems included, are copied and inserted in a new order (new order code, versnr. _1_).
-* _New order version_: All values, orderitems included, are copied and inserted in a **new order version** (versnr. + _1_).
-* _New activity_: All values are copied and inserted in a new activity (new activity code, versnr. _1_).
-* _New task_: All values are copied and inserted in a new task (new task code, versnr. _1_).
-* _Transfer delivery note_: All values are copied and inserted in a new order with OrderType Delivery note (new order code, versnr. _1_).
-* _Transfer invoice_: All values are copied and inserted in a new order with OrderType invoice (new order code, versnr. _1_).
-* _Set sent_: Sets the sent checkbox to active.
-* _cancel_: sets the cancel checkbox to active.
-* _set dunning_: opens a new edit context but only with the dunning date and dunning level fields for the user to enter the dunning date and levels.
-* _set paid_: opens a new edit context but only with the pay date and paid fields for the user to enter the pay date and paid amount.
-* _print reminder_: opens the reminder report for the current order.
-* _print order_: opens the order report for the current order.
+== Receipts:
+
+A receipt is a document that shows the details and cost of an order and proof that it has been paid for. The receipt can either be made standalone, or acquired from the offers. 
+The receipt type invoice also has a reminder, which will be sent to the customer if the receipt has not been paid before the due date.
+
+== Types of Receipts:
+
+Order confirmation: What the customer receives after ordering. Can be transferred to an invoice or a delivery note.
+Invoice: The main receipt of the order. It can be transferred to a delivery note, and a dunning date and level as well as the paid amount can be set. Also, a reminder can be printed.
+Delivery Note: What the customer receives after the item has been delivered.
+Credit: Similar to the invoice, but to be paid at a later date. The paid amount can also be set.
+Cancellation: What the customer receives upon the cancellation of the order.   
+
+
+
+
 == Submodules
 
 * Orderitem
\ No newline at end of file

entity/Order_entity/entityfields/cancel/documentation.adoc

+== CANCEL
+* _cancel_: sets the cancel checkbox to active.
\ No newline at end of file

entity/Order_entity/entityfields/dunningdate/documentation.adoc

@@ -2,4 +2,4 @@
 
 == Dunning date
 
-Contains the dunning date.
\ No newline at end of file
+Contains the dunning date. Field only visible when the order type is invoice, or when a new order is being created.
\ No newline at end of file

entity/Order_entity/entityfields/dunninglevel/documentation.adoc

@@ -3,4 +3,4 @@
 
 == Dunning level
 
-Contains the dunning level 1 or 2
\ No newline at end of file
+Contains the dunning level 1 or 2. Field only visible when the order type is invoice, or when a new order is being created.
\ No newline at end of file

entity/Order_entity/entityfields/newactivity/documentation.adoc

+== New Activity
+* _New activity_: All values are copied and inserted in a new activity (new activity code, versnr. _1_).
\ No newline at end of file

entity/Order_entity/entityfields/neworder/documentation.adoc

+== COPY ORDER
+* _Copy order_: All values, orderitems included, are copied and inserted in a new order (new order code, versnr. _1_).
\ No newline at end of file

entity/Order_entity/entityfields/neworderversion/documentation.adoc

+== NEW ORDER VERSION
+* _New order version_: All values, orderitems included, are copied and inserted in a **new order version** (versnr. + _1_).
\ No newline at end of file

entity/Order_entity/entityfields/newtask/documentation.adoc

+== NEW TASK
+* _New task_: All values are copied and inserted in a new task (new task code, versnr. _1_).
\ No newline at end of file

entity/Order_entity/entityfields/payduedate/documentation.adoc

+== PAYDUEDATE
+
+This field indicates when the payment is due. It is dependent on the PAYMENTTTERMS field, whether to be 7 days, 30 days or 38 days after the order
+creation date.
\ No newline at end of file

entity/Order_entity/entityfields/printorder/documentation.adoc

+== PRINT ORDER
+* _print order_: opens the order report for the current order.
\ No newline at end of file

entity/Order_entity/entityfields/printreminder/documentation.adoc

+== PRINT REMINDER
+* _print reminder_: opens the reminder report for the current order.
\ No newline at end of file

entity/Order_entity/entityfields/setdunning/documentation.adoc

+== SET DUNNING
+* _set dunning_: opens a new edit context but only with the dunning date and dunning level fields for the user to enter the dunning date and levels.
\ No newline at end of file

entity/Order_entity/entityfields/setpaid/documentation.adoc

+== SET PAID
+* _set paid_: opens a new edit context but only with the pay date and paid fields for the user to enter the pay date and paid amount.
\ No newline at end of file

entity/Order_entity/entityfields/setsent/documentation.adoc

+== Set sent
+* _Set sent_: Sets the sent checkbox to active.
\ No newline at end of file

entity/Order_entity/entityfields/transferdeliverynote/documentation.adoc

+== TRANSFER DELIVERY NOTE
+* _Transfer delivery note_: All values are copied and inserted in a new order with OrderType Delivery note (new order code, versnr. _1_).
\ No newline at end of file

entity/Order_entity/entityfields/transferinvoice/documentation.adoc

+== TRANSFER INVOICE
+* _Transfer invoice_: All values are copied and inserted in a new order with OrderType invoice (new order code, versnr. _1_).
\ No newline at end of file

entity/Orderitem_entity/documentation.adoc

@@ -4,6 +4,12 @@
 Entity contains products that belong to the linked order.
 It provides data from database table _SALESORDERITEM_ by a JDito record container.
 
+== Orderitems
+
+The order items are the are the items or item groups contained in the order. These can either be standalone or acquired from offers. If they are acquired from offers, the order items are 
+received exactly as they are from the offer items.
+
+
 == grantCreateProcess
 
 A new order item can only be added if the order associated with it is sent. If there are no order item, there is also no salesorderid, therefore 

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -5079,6 +5079,12 @@
     <entry>
       <key>Entrydate (Year)</key>
     </entry>
+    <entry>
+      <key>Permissions without actions are not allowed!</key>
+    </entry>
+    <entry>
+      <key>Attributes must be unique!</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>