From 0973ab3cc05241c297e42733be82678252791806 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Tue, 2 Mar 2021 14:02:27 +0100
Subject: [PATCH] [Projekt: xRM-Sales][TicketNr.: 1074034][Zahlenformate werden
systemweit korrekt dargestellt]
---
.../ClassificationScore_entity.aod | 7 +++++--
.../entityfields/scoreinpoints/valueProcess.js | 2 +-
entity/Classification_entity/Classification_entity.aod | 3 +++
entity/Offer_entity/Offer_entity.aod | 1 +
entity/Salesproject_entity/Salesproject_entity.aod | 3 ++-
5 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index f74a798ec3..e90b0af702 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -88,13 +88,16 @@
<contentType>NUMBER</contentType>
<maxValue v="100" />
<minValue v="0" />
- <outputFormat>0'%'</outputFormat>
- <inputFormat>0'%'</inputFormat>
+ <outputFormat>0.00'%'</outputFormat>
+ <inputFormat>0.00</inputFormat>
<onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/scorepercent/onValidation.js</onValidation>
</entityField>
<entityField>
<name>scoreInPoints</name>
<title>Points</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/scoreinpoints/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/ClassificationScore_entity/entityfields/scoreinpoints/valueProcess.js b/entity/ClassificationScore_entity/entityfields/scoreinpoints/valueProcess.js
index ab39285c8e..d971d3bccb 100644
--- a/entity/ClassificationScore_entity/entityfields/scoreinpoints/valueProcess.js
+++ b/entity/ClassificationScore_entity/entityfields/scoreinpoints/valueProcess.js
@@ -13,4 +13,4 @@ var maxPoints = newSelect("CLASSIFICATIONTYPE.SCOREPOINTS")
var points = percent/100*maxPoints;
if(!points)
points = 0;
-result.string(points.toFixed(2));
\ No newline at end of file
+result.string(points);
\ No newline at end of file
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index 0934836f18..e12475949f 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -151,6 +151,9 @@
<entityField>
<name>SCOREPOINTS</name>
<title>Points</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
</entityField>
<entityField>
<name>DISPLAYVALUE</name>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index c9a551b7de..900f465f94 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -174,6 +174,7 @@
<documentation>%aditoprj%/entity/Offer_entity/entityfields/totalgross/documentation.adoc</documentation>
<title>Total gross</title>
<contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index d463af5044..8d7dae6c6e 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -124,7 +124,8 @@
<title>Volume</title>
<description></description>
<contentType>NUMBER</contentType>
- <inputFormat>#0</inputFormat>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
<groupable v="true" />
<displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js</displayValueProcess>
</entityField>
--
GitLab