diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 85a3012b379898f7260550e9d10009abc31e6d04..e05c1f0edbef1dec24b8dbffb1399aa09732ba17 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/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>
diff --git a/entity/Order_entity/documentation.adoc b/entity/Order_entity/documentation.adoc
index 606c2f1b68cf6535c2f3bbd222b83ff9a9a5aca6..a95ff974601aad590b767047d74d2bd23eb074a8 100644
--- a/entity/Order_entity/documentation.adoc
+++ b/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
diff --git a/entity/Order_entity/entityfields/cancel/documentation.adoc b/entity/Order_entity/entityfields/cancel/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e3b0f3352779b56a024ac4e10fe06d1200db2153
--- /dev/null
+++ b/entity/Order_entity/entityfields/cancel/documentation.adoc
@@ -0,0 +1,2 @@
+== CANCEL
+* _cancel_: sets the cancel checkbox to active.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/contactid_param/documentation.adoc b/entity/Order_entity/entityfields/contactid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Order_entity/entityfields/dunningdate/documentation.adoc b/entity/Order_entity/entityfields/dunningdate/documentation.adoc
index c5fcff34a9eb51110f595ecd51b535f97125e502..2f60d8622ac08aca1aa6abcc9afd5ea258230aba 100644
--- a/entity/Order_entity/entityfields/dunningdate/documentation.adoc
+++ b/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
diff --git a/entity/Order_entity/entityfields/dunninglevel/documentation.adoc b/entity/Order_entity/entityfields/dunninglevel/documentation.adoc
index 42ab70be885704d4e719f6b7524fc828cfc99ac1..bfe71ad24411752cdee9e659a99ef7ecd7adb597 100644
--- a/entity/Order_entity/entityfields/dunninglevel/documentation.adoc
+++ b/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
diff --git a/entity/Order_entity/entityfields/newactivity/documentation.adoc b/entity/Order_entity/entityfields/newactivity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a7173e3d3ee541dd2afb6c48779106fba0c60f97
--- /dev/null
+++ b/entity/Order_entity/entityfields/newactivity/documentation.adoc
@@ -0,0 +1,2 @@
+== 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
diff --git a/entity/Order_entity/entityfields/neworder/documentation.adoc b/entity/Order_entity/entityfields/neworder/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4c9ee527fbffcb9873e60d3e07742bcca80c7cd5
--- /dev/null
+++ b/entity/Order_entity/entityfields/neworder/documentation.adoc
@@ -0,0 +1,2 @@
+== 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
diff --git a/entity/Order_entity/entityfields/neworderversion/documentation.adoc b/entity/Order_entity/entityfields/neworderversion/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..6bbf8c93b4fab59181e46a92743a1eddd3ac0ab7
--- /dev/null
+++ b/entity/Order_entity/entityfields/neworderversion/documentation.adoc
@@ -0,0 +1,2 @@
+== 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
diff --git a/entity/Order_entity/entityfields/newtask/documentation.adoc b/entity/Order_entity/entityfields/newtask/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..b1f9a15db8de26020cfc53e496f6098960a8f8f5
--- /dev/null
+++ b/entity/Order_entity/entityfields/newtask/documentation.adoc
@@ -0,0 +1,2 @@
+== 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
diff --git a/entity/Order_entity/entityfields/payduedate/documentation.adoc b/entity/Order_entity/entityfields/payduedate/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4e6d8e6314d63ff3794447d4b263951518d69a14
--- /dev/null
+++ b/entity/Order_entity/entityfields/payduedate/documentation.adoc
@@ -0,0 +1,4 @@
+== 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
diff --git a/entity/Order_entity/entityfields/printorder/documentation.adoc b/entity/Order_entity/entityfields/printorder/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..3bdfbaa9751493395871b18027d0fad5b627b37e
--- /dev/null
+++ b/entity/Order_entity/entityfields/printorder/documentation.adoc
@@ -0,0 +1,2 @@
+== PRINT ORDER
+* _print order_: opens the order report for the current order.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/printreminder/documentation.adoc b/entity/Order_entity/entityfields/printreminder/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..992913a2af64b4e43a069d52963faf3a5f6a0b99
--- /dev/null
+++ b/entity/Order_entity/entityfields/printreminder/documentation.adoc
@@ -0,0 +1,2 @@
+== PRINT REMINDER
+* _print reminder_: opens the reminder report for the current order.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/setdunning/documentation.adoc b/entity/Order_entity/entityfields/setdunning/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..5ac4e02565deb829a1cbda26b1cd9274bce7ea60
--- /dev/null
+++ b/entity/Order_entity/entityfields/setdunning/documentation.adoc
@@ -0,0 +1,2 @@
+== 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
diff --git a/entity/Order_entity/entityfields/setpaid/documentation.adoc b/entity/Order_entity/entityfields/setpaid/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..61dc104164cd584581f3ed2660cb641928b5084a
--- /dev/null
+++ b/entity/Order_entity/entityfields/setpaid/documentation.adoc
@@ -0,0 +1,2 @@
+== 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
diff --git a/entity/Order_entity/entityfields/setsent/documentation.adoc b/entity/Order_entity/entityfields/setsent/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..0d89607fe24836f3030b017b0478f4f3baceb84e
--- /dev/null
+++ b/entity/Order_entity/entityfields/setsent/documentation.adoc
@@ -0,0 +1,2 @@
+== Set sent
+* _Set sent_: Sets the sent checkbox to active.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/transferdeliverynote/documentation.adoc b/entity/Order_entity/entityfields/transferdeliverynote/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..49d4604e42354b63a3f03232e936c08ff2053d2e
--- /dev/null
+++ b/entity/Order_entity/entityfields/transferdeliverynote/documentation.adoc
@@ -0,0 +1,2 @@
+== 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
diff --git a/entity/Order_entity/entityfields/transferinvoice/documentation.adoc b/entity/Order_entity/entityfields/transferinvoice/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d493af2c348ba4e024ddd6c74e3d148c02bb2c39
--- /dev/null
+++ b/entity/Order_entity/entityfields/transferinvoice/documentation.adoc
@@ -0,0 +1,2 @@
+== 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
diff --git a/entity/Orderitem_entity/documentation.adoc b/entity/Orderitem_entity/documentation.adoc
index 48f78a2a007cb43e91177e27de310280ee845d06..145ceb970e81bd16471d4ea22117b5049a40cbf5 100644
--- a/entity/Orderitem_entity/documentation.adoc
+++ b/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
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 644fc311de742f855e4e52fac22098e69c64240c..0ab88e5fa102e41fa95460462bdd373131a26dc1 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/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>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 980105a87150c5e934a12ea604b8c9e1acb657da..1cff68063f66eef138ef818d93407a65f3c7b673 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -62,10 +62,6 @@
<key>Anonymization</key>
<value>Anonymisierung</value>
</entry>
- <entry>
- <key>Theme</key>
- <value>Thema</value>
- </entry>
<entry>
<key>Turnover change</key>
<value>Entwicklung Umsatz</value>
@@ -100,11 +96,6 @@
</entry>
<entry>
<key>Recipient status</key>
- <value>Empfängerstatus</value>
- </entry>
- <entry>
- <key>Download template</key>
- <value>Vorlage herunterladen</value>
</entry>
<entry>
<key>LOW</key>
@@ -1839,7 +1830,7 @@
</entry>
<entry>
<key>New receipt version</key>
- <value>Neue Quittungsversion</value>
+ <value>Neue Belegsversion</value>
</entry>
<entry>
<key>Orderitems</key>
@@ -2133,10 +2124,6 @@
<key>Montserrat</key>
<value>Montserrat</value>
</entry>
- <entry>
- <key>Entrydate (Year)</key>
- <value>Eingangsdatum (Jahr)</value>
- </entry>
<entry>
<key>Guadeloupe</key>
<value>Guadeloupe</value>
@@ -6214,178 +6201,228 @@
<key>2</key>
</entry>
<entry>
- <key>Action '</key>
+ <key>versendet</key>
+ </entry>
+ <entry>
+ <key>Netto</key>
+ </entry>
+ <entry>
+ <key>Währung</key>
+ </entry>
+ <entry>
+ <key>Transfer to Invoice</key>
+ <value>In Rechnung übertragen</value>
+ </entry>
+ <entry>
+ <key>Pay due date</key>
+ <value>Zahlungsziel</value>
</entry>
<entry>
<key>Invoice</key>
+ <value>Rechnung</value>
+ </entry>
+ <entry>
+ <key>Payment address</key>
+ <value>Zahlungsadresse</value>
</entry>
<entry>
<key>Receipt Footer Text</key>
+ <value>Beleg Fußtext</value>
</entry>
<entry>
- <key>Delivery note</key>
+ <key>Texts</key>
+ <value>Texte</value>
</entry>
<entry>
- <key>Permission Action</key>
+ <key>keine Standard-E-Mail Büro vorhanden !</key>
</entry>
<entry>
- <key>Order confirmation</key>
+ <key>Delivery note</key>
+ <value>Lieferschein</value>
</entry>
<entry>
- <key>Receipt Header Text</key>
+ <key>Belegdatum</key>
</entry>
<entry>
- <key>Filter</key>
+ <key>Firma</key>
</entry>
<entry>
- <key>Cancellation</key>
+ <key>Choose payment address</key>
+ <value>Zahlungsadresse auswählen</value>
</entry>
<entry>
- <key>Bulk mail \"%0\" sent</key>
+ <key>Paid</key>
+ <value>Bezahlt</value>
</entry>
<entry>
- <key>Actions</key>
+ <key>Dunning level</key>
+ <value>Mahnstufe</value>
</entry>
<entry>
- <key>Credit</key>
+ <key>Order confirmation</key>
+ <value>Auftragsbestätigung</value>
</entry>
<entry>
- <key>Reminder</key>
+ <key>Beleg</key>
</entry>
<entry>
- <key>versendet</key>
+ <key>Order Type</key>
+ <value>Belegtyp</value>
</entry>
<entry>
- <key>Netto</key>
+ <key>Notice</key>
+ <value>Notiz</value>
</entry>
<entry>
- <key>Only </key>
+ <key>Bitte einen Adressat in 'to' eintragen!</key>
</entry>
<entry>
- <key>Währung</key>
+ <key>Receipt Header Text</key>
+ <value>Beleg Kopftext</value>
</entry>
<entry>
- <key>Transfer to Invoice</key>
+ <key>Dunning text</key>
+ <value>Mahnungstext</value>
</entry>
<entry>
- <key>Pay due date</key>
+ <key>Choose delivery address</key>
+ <value>Lieferadresse auswählen</value>
</entry>
<entry>
- <key>No duplicates allowed: action '</key>
+ <key>Cancellation</key>
+ <value>Storno</value>
</entry>
<entry>
- <key>Payment address</key>
+ <key>Links</key>
</entry>
<entry>
- <key>Texts</key>
+ <key>geprüft</key>
</entry>
<entry>
- <key>Print reminder</key>
+ <key>Set dunning</key>
+ <value>Mahnstufe setzen</value>
</entry>
<entry>
- <key>keine Standard-E-Mail Büro vorhanden !</key>
+ <key>Beleg-Nr.</key>
</entry>
<entry>
- <key>Rech.-Betrag</key>
+ <key>Cancel</key>
+ <value>Stornieren</value>
</entry>
<entry>
- <key>Order date</key>
+ <key>Set to sent</key>
+ <value>Versendet setzen</value>
</entry>
<entry>
- <key>Due date</key>
+ <key>Set paid amount</key>
+ <value>Bezahlten Betrag setzen</value>
</entry>
<entry>
- <key>Order amount</key>
+ <key>Belegliste</key>
</entry>
<entry>
- <key>Belegdatum</key>
+ <key>Pay date</key>
+ <value>Zahlungseingang</value>
</entry>
<entry>
- <key>Firma</key>
+ <key>Transfer to delivery note</key>
+ <value>In Lieferschein übertragen</value>
</entry>
<entry>
- <key>Choose payment address</key>
+ <key>Dunning date</key>
+ <value>Mahndatum</value>
</entry>
<entry>
- <key>Adds the selection to a bulk mail</key>
+ <key>Credit</key>
+ <value>Gutschrift</value>
</entry>
<entry>
- <key>Order number</key>
+ <key>Print order</key>
+ <value>Beleg drucken</value>
</entry>
<entry>
- <key>Paid</key>
+ <key>Adds the selection to a bulk mail</key>
</entry>
<entry>
- <key>Empty actions are not allowed!</key>
+ <key>Order number</key>
+ <value>Belegsnummer</value>
</entry>
<entry>
- <key>Dunning level</key>
+ <key>Permission Action</key>
</entry>
<entry>
- <key>Print order</key>
+ <key>Filter</key>
</entry>
<entry>
- <key>Beleg</key>
+ <key>Adds the selection to a serial letter</key>
</entry>
<entry>
- <key>Order Type</key>
+ <key>Actions</key>
</entry>
<entry>
- <key>Notice</key>
+ <key>Reminder</key>
+ <value>Mahnung</value>
</entry>
<entry>
- <key>Bitte einen Adressat in 'to' eintragen!</key>
+ <key>Print reminder</key>
+ <value>Mahnung drucken</value>
</entry>
<entry>
- <key>Dunning text</key>
+ <key>Rech.-Betrag</key>
</entry>
<entry>
- <key>Choose delivery address</key>
+ <key>Order date</key>
+ <value>Belegsdatum</value>
</entry>
<entry>
- <key>Links</key>
+ <key>Due date</key>
+ <value>Mahndatum</value>
</entry>
<entry>
- <key>geprüft</key>
+ <key>Order amount</key>
</entry>
<entry>
<key>Mahnung</key>
</entry>
<entry>
- <key>Set dunning</key>
+ <key>Due</key>
+ <value>Fällig</value>
</entry>
<entry>
- <key>Beleg-Nr.</key>
+ <key>Only </key>
</entry>
<entry>
- <key>Adds the selection to a serial letter</key>
+ <key>Theme</key>
+ <value>Thema</value>
</entry>
<entry>
- <key>Cancel</key>
+ <key>Action '</key>
</entry>
<entry>
- <key>Set to sent</key>
+ <key>No duplicates allowed: action '</key>
</entry>
<entry>
- <key>Due</key>
+ <key>Empty actions are not allowed!</key>
</entry>
<entry>
- <key>Set paid amount</key>
+ <key>Download template</key>
+ <value>Vorlage herunterladen</value>
</entry>
<entry>
- <key>Belegliste</key>
+ <key>Bulk mail \"%0\" sent</key>
</entry>
<entry>
- <key>Pay date</key>
+ <key>This error should never appear - contact administrator.</key>
</entry>
<entry>
- <key>This error should never appear - contact administrator.</key>
+ <key>Entrydate (Year)</key>
+ <value>Eingangsdatum (Jahr)</value>
</entry>
<entry>
- <key>Transfer to delivery note</key>
+ <key>Attributes must be unique!</key>
</entry>
<entry>
- <key>Dunning date</key>
+ <key>Permissions without actions are not allowed!</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 40e22b90024ec497c7c801bee31173beab7ae72c..d8f884a75bfaf38badfc69f2c29828b4ec4a5f48 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5129,6 +5129,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" />
</language>
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index bc6c338a134c68dd4b8ee87de73ee44ef74fe8e4..a15b9b48af33ff0aa6b622c27ea0c98d51e56391 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -372,7 +372,7 @@ OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLa
"OrderLanguage_param" : pLanguage,
"OfferId_param" : pOfferId,
"OrderCurrency_param" : pCurrency || "",
- "OrderAddress_param" : pAddress || "",
+ "OrderPaymentAddress_param" : pAddress || "",
"OrderHeader_param" : pHeader || ""
};
neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);