From bdef2e5ced45d2c21b2a863de7d1772959e8f8b7 Mon Sep 17 00:00:00 2001
From: "s.neumaier" <s.neumaier@adito.de>
Date: Wed, 11 Nov 2020 10:10:18 +0100
Subject: [PATCH] [Projekt: Entwicklung - xRM][TicketNr.: 1068641][Angebote -
Gesamtrabatt / Rechnungsrabatt]
---
entity/Offer_entity/Offer_entity.aod | 1 +
.../entityfields/discounted_net/stateProcess.js | 10 ++++++++++
.../entityfields/totalgross/valueProcess.js | 3 ++-
3 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 entity/Offer_entity/entityfields/discounted_net/stateProcess.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index eee788f8ab..5bb9a98c28 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1075,6 +1075,7 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_net/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
diff --git a/entity/Offer_entity/entityfields/discounted_net/stateProcess.js b/entity/Offer_entity/entityfields/discounted_net/stateProcess.js
new file mode 100644
index 0000000000..7443b0c0dc
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_net/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+var discount = vars.get("$field.DISCOUNT");
+
+if(parseInt(discount) == parseInt("0") || !discount)
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+else
+ result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/totalgross/valueProcess.js b/entity/Offer_entity/entityfields/totalgross/valueProcess.js
index 969aa80e1c..0be973c098 100644
--- a/entity/Offer_entity/entityfields/totalgross/valueProcess.js
+++ b/entity/Offer_entity/entityfields/totalgross/valueProcess.js
@@ -2,7 +2,8 @@ import("system.result");
import("system.vars");
import("system.eMath");
-var netValue = vars.get("$field.DISCOUNTED_NET");
+var discount = vars.get("$field.DISCOUNT");
+var netValue = discount && parseInt(discount) != parseInt("0") ? vars.get("$field.DISCOUNTED_NET") : vars.get("$field.NET")
var vatValue = vars.get("$field.VAT");
result.string( eMath.addDec(netValue, vatValue) );
\ No newline at end of file
--
GitLab