From 929d6dbbf212c16328f6c156f999d249e6ccd63f Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Wed, 25 Aug 2021 15:40:30 +0000
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-Sales][TicketNr.:=201084093][36?=
=?UTF-8?q?0=C2=B0=20Vertriebsprojekt=20Beschreibung=20wird=20nicht=20korr?=
=?UTF-8?q?ekt=20bef=C3=BCllt]=20[Projekt:=20xRM-Sales][TicketNr.:=2010861?=
=?UTF-8?q?90][360=C2=B0=20Brutto=20von=20Angeboten=20zeigt=20immer=200=20?=
=?UTF-8?q?an=20]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/Offer_entity/contentDescriptionProcess.js | 3 ++-
entity/Salesproject_entity/contentDescriptionProcess.js | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/entity/Offer_entity/contentDescriptionProcess.js b/entity/Offer_entity/contentDescriptionProcess.js
index 57c6fc7fc6..f531fc1394 100644
--- a/entity/Offer_entity/contentDescriptionProcess.js
+++ b/entity/Offer_entity/contentDescriptionProcess.js
@@ -5,7 +5,8 @@ import("system.datetime");
import("system.vars");
import("system.result");
-var res = [translate.text("Total gross") + ": " + vars.get("$field.TotalGross.displayValue"),
+var formattedGross = NumberUtils.formatWithCurrency(vars.get("$field.TotalGross"), translate.text("#,##0.00"), vars.get("$field.CURRENCY"));
+var res = [translate.text("Total gross") + ": " + formattedGross,
translate.text("Probability") + ": " + vars.get("$field.PROBABILITY") + "%",
translate.text("Creation date") + ": " + datetime.toDate(vars.get("$field.DATE_NEW"), translate.text("dd.MM.yyyy"))];
diff --git a/entity/Salesproject_entity/contentDescriptionProcess.js b/entity/Salesproject_entity/contentDescriptionProcess.js
index 3e00d9c673..89556fc7d2 100644
--- a/entity/Salesproject_entity/contentDescriptionProcess.js
+++ b/entity/Salesproject_entity/contentDescriptionProcess.js
@@ -1,3 +1,5 @@
+import("Util_lib");
+import("system.logging");
import("Keyword_lib");
import("system.translate");
import("system.datetime");
@@ -7,8 +9,8 @@ import("KeywordRegistry_basic");
var res = [translate.text("Phase") + ": " + KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")),
translate.text("Classification: ") + vars.get("$field.CLASSIFICATIONVALUE"),
- translate.text("Volume") + ": " + vars.get("$field.VOLUME.displayValue"),
- translate.text("Probability") + ": " + vars.get("$field.PROBABILITY.displayValue"),
+ translate.text("Volume") + ": " + NumberUtils.formatWithCurrency(vars.get("$field.VOLUME"), translate.text("#,##0.00"), "€"),
+ translate.text("Probability") + ": " + vars.get("$field.PROBABILITY") + "%",
translate.text("Creation date") + ": " + datetime.toDate(vars.get("$field.DATE_NEW"), translate.text("dd.MM.yyyy"))];
result.string(res.join(" | "));
\ No newline at end of file
--
GitLab