From cb0072183c42d6a0eb63f577b8364a34759ceae7 Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Tue, 18 Dec 2018 13:14:28 +0100
Subject: [PATCH] fixes
---
.../entityfields/optional/possibleItemsProcess.js | 4 ++--
entity/Pers_entity/entityfields/org_id/displayValueProcess.js | 1 -
process/OfferOrder_lib/process.js | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js b/entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js
index 8ddad3ebcc..b88d5392d1 100644
--- a/entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js
+++ b/entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js
@@ -2,6 +2,6 @@ import("system.translate");
import("system.result");
result.object([
- [1, translate.text("Yes")]
- ,[0, translate.text("No")]
+ ["1", translate.text("Yes")]
+ ,["0", translate.text("No")]
]);
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/org_id/displayValueProcess.js b/entity/Pers_entity/entityfields/org_id/displayValueProcess.js
index 98b2cc6e35..93bb6fe066 100644
--- a/entity/Pers_entity/entityfields/org_id/displayValueProcess.js
+++ b/entity/Pers_entity/entityfields/org_id/displayValueProcess.js
@@ -1,5 +1,4 @@
import("system.result");
-import("system.logging");
import("system.vars");
import("Sql_lib");
import("system.db");
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index ffbab0b9ea..73f763e3a7 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -70,7 +70,7 @@ OfferUtils.getOfferNetAndVAT = function(offerId, offeritemIdsToDel) {
});
}
- var offerItems = db.table(condition.buildSelect("select QUANTITY, PRICE, DISCOUNT, VAT, OPTIONAL from OFFERITEM", "1 = 0", afterCondition));
+ var offerItems = db.table(condition.buildSelect("select QUANTITY, PRICE, DISCOUNT, VAT, OPTIONAL from OFFERITEM", "1 = 0"));
for (var i = 0; i < offerItems.length; i++)
{
--
GitLab