From e88d5ca6cef4e24fb8fe9b5020dffc3f95a99bd0 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Mar 2019 09:38:32 +0100
Subject: [PATCH] Offer / Order / Salesproject fixes
---
entity/Offeritem_entity/Offeritem_entity.aod | 2 +-
.../children/currency_param}/valueProcess.js | 0
entity/Orderitem_entity/Orderitem_entity.aod | 1 -
.../entityfields/volume/titleProcess.js | 2 +-
4 files changed, 2 insertions(+), 3 deletions(-)
rename entity/Offeritem_entity/entityfields/{itemposition => offeritems/children/currency_param}/valueProcess.js (100%)
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 540a2c31e61..ad258bf3ad7 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -34,7 +34,6 @@
<name>ITEMPOSITION</name>
<title>Position</title>
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/itemposition/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ITEMSORT</name>
@@ -164,6 +163,7 @@
</entityParameter>
<entityParameter>
<name>Currency_param</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
<entityParameter>
diff --git a/entity/Offeritem_entity/entityfields/itemposition/valueProcess.js b/entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js
similarity index 100%
rename from entity/Offeritem_entity/entityfields/itemposition/valueProcess.js
rename to entity/Offeritem_entity/entityfields/offeritems/children/currency_param/valueProcess.js
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 21b47054a44..560c0b7facb 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -12,7 +12,6 @@
</entityProvider>
<entityField>
<name>ASSIGNEDTO</name>
- <valueProcess></valueProcess>
</entityField>
<entityField>
<name>DISCOUNT</name>
diff --git a/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js b/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
index dd25fd0e8ea..a85f1176a29 100644
--- a/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
+++ b/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.translate");
-result.string(translate.text("${VOLUME_MONEY}") + " " + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}"));
\ No newline at end of file
+result.string(translate.text("${VOLUME_MONEY}") + " (" + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}") + ")");
\ No newline at end of file
--
GitLab