From 267a1488e9211081fe1f28c374030e3586fbda31 Mon Sep 17 00:00:00 2001
From: Pascal Neub <p.neub@adito.de>
Date: Wed, 21 Jul 2021 13:58:16 +0000
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-Sales][TicketNr.:=201084720][An?=
=?UTF-8?q?gebotsposten=20l=C3=B6schen=20aktualisiert=20Netto=20Summe=20ni?=
=?UTF-8?q?cht]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/Offeritem_entity/Offeritem_entity.aod | 1 +
.../recordcontainers/db/onDBDelete.js | 24 +++++++++-----
.../recordcontainers/db/onDBUpdate.js | 31 ++++++++-----------
entity/Orderitem_entity/Orderitem_entity.aod | 1 +
.../recordcontainers/db/onDBDelete.js | 18 ++++++-----
.../recordcontainers/db/onDBInsert.js | 29 ++++++++---------
.../recordcontainers/db/onDBUpdate.js | 28 +++++++----------
7 files changed, 67 insertions(+), 65 deletions(-)
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index f6360e58a2..fd80ccbb1c 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -298,6 +298,7 @@
<dbRecordContainer>
<name>db</name>
<maximumDbRows v="0" />
+ <isPageable v="false" />
<hasDependentRecords v="true" />
<conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js b/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
index c00baa2b4d..5d2691b811 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
@@ -12,19 +12,27 @@ if(oid != "")
var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): "";
var oiUtils = new OfferItemUtils(oid);
var deletedIds = oiUtils.deletePartsList(oiid);
- oiUtils.reOrgItems();
-
deletedIds.push(oiid);
- var cols = ["NET", "VAT"];
- var vals = oiUtils.getNetAndVat(deletedIds);
+ oiUtils.reOrgItems();
+ var vals = oiUtils.getNetAndVat(deletedIds);
var discountedVals = OfferItemUtils.getDiscountedNet(deletedIds, oid, discount);
+
+ var fieldValues = {
+ NET: vals[0].toString(),
+ VAT: vals[1].toString()
+ };
if(discountedVals)
{
- cols.push("DISCOUNTED_NET", "DISCOUNTED_VAT");
- vals = vals.concat(discountedVals);
+ Object.assign(fieldValues, {
+ DISCOUNTED_NET: discountedVals[0].toString(),
+ DISCOUNTED_VAT: discountedVals[1].toString()
+ });
}
- newWhere("SALESORDER.SALESORDERID", oid)
- .updateData(true, "SALESORDER", cols, null, vals);
+ var config = entities.createConfigForUpdatingRows();
+ config.entity("Offer_entity");
+ config.uid(oid);
+ config.fieldValues(fieldValues);
+ entities.updateRow(config);
}
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
index 4e1864a665..4cc7b7e6a0 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
@@ -16,28 +16,23 @@ if(oid != "")
var oiUtils = new OfferItemUtils(oid);
var vals = oiUtils.getNetAndVat();
var discountedVals = OfferItemUtils.getDiscountedNet(null, oid, discount);
-
- let config = entities.createConfigForUpdatingRows()
- config.entity("Offer_entity");
-
+
+ var fieldValues = {
+ NET: vals[0].toString(),
+ VAT: vals[1].toString()
+ };
if(discountedVals)
{
- config.fieldValues({
- "NET": vals[0],
- "VAT": vals[1],
- "DISCOUNTED_NET": discountedVals[0],
- "DISCOUNTED_VAT": discountedVals[1]
- });
- }
- else
- {
- config.fieldValues({
- "NET": vals[0],
- "VAT": vals[1]
+ Object.assign(fieldValues, {
+ DISCOUNTED_NET: discountedVals[0].toString(),
+ DISCOUNTED_VAT: discountedVals[1].toString()
});
}
-
+
+ var config = entities.createConfigForUpdatingRows();
+ config.entity("Offer_entity");
config.uid(oid);
+ config.fieldValues(fieldValues);
entities.updateRow(config);
}
@@ -80,4 +75,4 @@ if(oid != "")
db.execute(statements);// no write entity -> performance reason
}
}
-}
\ No newline at end of file
+}
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 6c64a71bd8..bbbec99b03 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -279,6 +279,7 @@
<dbRecordContainer>
<name>db</name>
<maximumDbRows v="0" />
+ <isPageable v="false" />
<hasDependentRecords v="true" />
<conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
diff --git a/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js b/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js
index f2ff1df452..f2dca5631d 100644
--- a/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js
@@ -1,6 +1,5 @@
-import("system.neon");
+import("system.entities");
import("system.vars");
-import("system.db");
import("Order_lib");
import("Sql_lib");
@@ -13,9 +12,14 @@ if(oid != "")
oiUtils.reOrgItems();
deletedIds.push(oiid);
- var cols = ["NET", "VAT"];
- var vals = oiUtils.getNetAndVat(deletedIds);
+ var offerData = oiUtils.getNetAndVat(deletedIds);
- newWhere("SALESORDER.SALESORDERID", oid)
- .updateData(true, "SALESORDER", cols, null, vals);
-}
\ No newline at end of file
+ var config = entities.createConfigForUpdatingRows();
+ config.entity("Order_entity");
+ config.uid(oid);
+ config.fieldValues({
+ NET: offerData[0].toString(),
+ VAT: offerData[1].toString()
+ });
+ entities.updateRow(config);
+}
diff --git a/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js b/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
index 2c949920f2..66a4d8880d 100644
--- a/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
@@ -26,24 +26,21 @@ if(oid != "")
var vals = oiUtils.getNetAndVat();
var discountedVals = OrderItemUtils.getDiscountedNet(null, oid, discount);
- let config = entities.createConfigForUpdatingRows()
- config.entity("Order_entity");
-
- if(discountedVals){
- config.fieldValues({
- "NET": vals[0],
- "VAT": vals[1],
- "DISCOUNTED_NET": discountedVals[0],
- "DISCOUNTED_VAT": discountedVals[1]
- });
- }
- else
+ var fieldValues = {
+ NET: vals[0].toString(),
+ VAT: vals[1].toString()
+ };
+ if(discountedVals)
{
- config.fieldValues({
- "NET": vals[0],
- "VAT": vals[1]
+ Object.assign(fieldValues, {
+ DISCOUNTED_NET: discountedVals[0].toString(),
+ DISCOUNTED_VAT: discountedVals[1].toString()
});
}
+
+ var config = entities.createConfigForUpdatingRows();
+ config.entity("Order_entity");
config.uid(oid);
+ config.fieldValues(fieldValues);
entities.updateRow(config);
-}
\ No newline at end of file
+}
diff --git a/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js b/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
index ad90012920..9def4d0900 100644
--- a/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
@@ -14,27 +14,23 @@ if(oid != "")
var oiUtils = new OrderItemUtils(oid);
var vals = oiUtils.getNetAndVat();
var discountedVals = OrderItemUtils.getDiscountedNet(null, oid, discount);
-
- let config = entities.createConfigForUpdatingRows()
- config.entity("Order_entity");
-
+
+ var fieldValues = {
+ NET: vals[0].toString(),
+ VAT: vals[1].toString()
+ };
if(discountedVals)
{
- config.fieldValues({
- "NET": vals[0],
- "VAT": vals[1],
- "DISCOUNTED_NET": discountedVals[0],
- "DISCOUNTED_VAT": discountedVals[1]
- });
- }
- else
- {
- config.fieldValues({
- "NET": vals[0],
- "VAT": vals[1]
+ Object.assign(fieldValues, {
+ DISCOUNTED_NET: discountedVals[0].toString(),
+ DISCOUNTED_VAT: discountedVals[1].toString()
});
}
+
+ var config = entities.createConfigForUpdatingRows();
+ config.entity("Order_entity");
config.uid(oid);
+ config.fieldValues(fieldValues);
entities.updateRow(config);
}
--
GitLab