From b1571b11e5efb2fa540e7ba784923b72ca010e04 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Thu, 30 Jan 2020 08:58:20 +0000
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?=
=?UTF-8?q?=201043365][Beleg=20-=20Sammelticket=20zur=20=C3=9Cberarbeitung?=
=?UTF-8?q?=20des=20Belegs]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/Order_entity/Order_entity.aod | 5 +++++
.../entityfields/isolanguage/valueProcess.js | 6 ++++--
.../entityfields/object_rowid/valueProcess.js | 2 ++
.../entityfields/objectrowid_param/valueProcess.js | 0
.../entityfields/orderlanguage_param/valueProcess.js | 8 ++++++++
.../entityfields/ordertype_param/valueProcess.js | 0
process/Order_lib/process.js | 9 ++++-----
7 files changed, 23 insertions(+), 7 deletions(-)
create mode 100644 entity/Order_entity/entityfields/objectrowid_param/valueProcess.js
create mode 100644 entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
create mode 100644 entity/Order_entity/entityfields/ordertype_param/valueProcess.js
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 3dbd2b7987b..33b6cb02583 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/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>
diff --git a/entity/Order_entity/entityfields/isolanguage/valueProcess.js b/entity/Order_entity/entityfields/isolanguage/valueProcess.js
index b1684b313cd..77df925266a 100644
--- a/entity/Order_entity/entityfields/isolanguage/valueProcess.js
+++ b/entity/Order_entity/entityfields/isolanguage/valueProcess.js
@@ -1,7 +1,9 @@
+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
+}
diff --git a/entity/Order_entity/entityfields/object_rowid/valueProcess.js b/entity/Order_entity/entityfields/object_rowid/valueProcess.js
index 947890744e1..ab26d1b15da 100644
--- a/entity/Order_entity/entityfields/object_rowid/valueProcess.js
+++ b/entity/Order_entity/entityfields/object_rowid/valueProcess.js
@@ -1,6 +1,8 @@
+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
diff --git a/entity/Order_entity/entityfields/objectrowid_param/valueProcess.js b/entity/Order_entity/entityfields/objectrowid_param/valueProcess.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js b/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
new file mode 100644
index 00000000000..28676a75cab
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
@@ -0,0 +1,8 @@
+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
diff --git a/entity/Order_entity/entityfields/ordertype_param/valueProcess.js b/entity/Order_entity/entityfields/ordertype_param/valueProcess.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 4e61d24cea2..a8012d67187 100644
--- a/process/Order_lib/process.js
+++ b/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;
--
GitLab