Merge branch 'Receipt' into 'master'

Receipt

See merge request xrm/basic!59

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" />

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>

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);