Merge branch '1043365_ÜberarbeitenBeleg' into 'master'

1043365 überarbeiten beleg

See merge request xrm/basic!108

entity/Order_entity/Order_entity.aod

@@ -296,6 +296,7 @@
     </entityParameter>
     <entityParameter>
       <name>OrderLanguage_param</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js</valueProcess>
       <expose v="true" />
       <mandatory v="false" />
       <description>PARAMETER</description>
@@ -593,6 +594,7 @@
     </entityParameter>
     <entityParameter>
       <name>ObjectRowId_param</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/objectrowid_param/valueProcess.js</valueProcess>
       <expose v="true" />
       <documentation>%aditoprj%/entity/Order_entity/entityfields/objectrowid_param/documentation.adoc</documentation>
       <description>PARAMETER</description>
@@ -779,6 +781,7 @@
     </entityParameter>
     <entityParameter>
       <name>OrderType_param</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/ordertype_param/valueProcess.js</valueProcess>
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
@@ -1008,6 +1011,8 @@
         <dbRecordFieldMapping>
           <name>LANGUAGE.value</name>
           <recordfield>SALESORDER.ISOLANGUAGE</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>NET.value</name>

entity/Order_entity/entityfields/isolanguage/valueProcess.js

+import("system.neon");
 import("system.result");
 import("system.vars");
+import("KeywordRegistry_basic");
 
-if (vars.exists("$param.OrderLanguage_param")) 
+if (vars.exists("$param.OrderLanguage_param") && vars.get("$param.OrderLanguage_param")) 
 {
     result.string(vars.get("$param.OrderLanguage_param"));
-}
\ No newline at end of file
+}

entity/Order_entity/entityfields/object_rowid/valueProcess.js

+import("system.logging");
 import("system.neon");
 import("system.vars");
 import("system.result");
 
+
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
     result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file

entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js

+import("system.logging");
+import("system.vars");
+import("system.db");
+import("system.result");
+
+var salesorderid = vars.get("$field.SALESORDERID")
+if(salesorderid)
+result.string(db.cell("select ISOLANGUAGE from SALESORDER where SALESORDERID = '" + salesorderid + "'"))
\ No newline at end of file

process/Order_lib/process.js

@@ -124,7 +124,7 @@ OrderUtils.copyOrder = function (pOfferId, pContactId, pOrderType, pLanguage, pC
  * @param {String} pOfferId the offer to get the items from
  * @param {String} pOrderId the order to create the items for
  */
-OrderUtils.copyOfferItemsToOrder = function (pOfferId, pOrderId)
+OrderUtils.copyOfferItemsToOrder = function (pSourceOfferId, pOrderId)
 {
     var InputMapping = {
         "OFFERITEM": {
@@ -435,14 +435,13 @@ OrderUtils.openReminderReport = function (pOrderID)
         "''"
     ]; 
     
-    var orderItemSql = newSelect(orderItemFields)
+    var itemData = newSelect(orderItemFields)
                             .from("SALESORDERITEM")
-                            .leftJoin("PRODUCT", "PRODUCT.PRODUCTID = SALESORDERITEM.PRODUCT_I")
+                            .leftJoin("PRODUCT", "PRODUCT.PRODUCTID = SALESORDERITEM.PRODUCT_ID")
                             .where("SALESORDERITEM.SALESORDER_ID", pOrderID)
                             .table();
 
-    var itemData = db.table(orderItemSql);
-    
+
     if (itemData.length == 0)
         return;