From f0f409f8a07f233929664894901253cb6d03a19c Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 20 Mar 2019 16:33:01 +0100
Subject: [PATCH] Vertriebsprojekt Numberformat
---
entity/Salesproject_entity/Salesproject_entity.aod | 5 +++--
.../entityfields/volume/displayValueProcess.js | 6 ------
.../Salesproject_entity/entityfields/volume/titleProcess.js | 4 ++++
3 files changed, 7 insertions(+), 8 deletions(-)
delete mode 100644 entity/Salesproject_entity/entityfields/volume/displayValueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/volume/titleProcess.js
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 2ad5427c84..ae3e8887b5 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -85,8 +85,9 @@
<name>VOLUME</name>
<title>Volume</title>
<description>The displayValue from the recoord container adds T € (translated)</description>
- <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/volume/onValidation.js</onValidation>
+ <contentType>NUMBER</contentType>
+ <outputFormat>0</outputFormat>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/titleProcess.js</titleProcess>
</entityField>
<entityConsumer>
<name>Organisations</name>
diff --git a/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js b/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js
deleted file mode 100644
index 55d8076a73..0000000000
--- a/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-var volume = vars.get("$field.VOLUME");
-result.string(parseInt(volume) + " " + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}"))
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volume/titleProcess.js b/entity/Salesproject_entity/entityfields/volume/titleProcess.js
new file mode 100644
index 0000000000..1a6ace2c3d
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/volume/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("Volume") + " (" + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}") + ")");
\ No newline at end of file
--
GitLab