From b0a18bb66080eba3ca30d3c836ecf7e306f891b7 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 26 Mar 2019 11:28:57 +0100
Subject: [PATCH] Salesproject / Offer fixes

---
 entity/Offer_entity/Offer_entity.aod                     | 1 +
 entity/Offer_entity/entityfields/status/valueProcess.js  | 6 ++++++
 .../SalesprojectMember_entity.aod                        | 1 +
 entity/Timetracking_entity/Timetracking_entity.aod       | 1 +
 .../entityfields/minutes/titleProcess.js                 | 9 +++++++++
 language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod     | 6 ++++++
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod           | 4 ++++
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod           | 6 ++++++
 8 files changed, 34 insertions(+)
 create mode 100644 entity/Offer_entity/entityfields/status/valueProcess.js
 create mode 100644 entity/Timetracking_entity/entityfields/minutes/titleProcess.js

diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 42e32ee83e1..ff52a60e35b 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -78,6 +78,7 @@
       <title>Status</title>
       <consumer>KeywordOfferStates</consumer>
       <state>EDITABLE</state>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
diff --git a/entity/Offer_entity/entityfields/status/valueProcess.js b/entity/Offer_entity/entityfields/status/valueProcess.js
new file mode 100644
index 00000000000..ea5cc54c968
--- /dev/null
+++ b/entity/Offer_entity/entityfields/status/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+    result.string("25b0ac77-ef92-4809-802e-bb9d8782f865"); //Open
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index c3eb99ba47e..94831ab5685 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -13,6 +13,7 @@
       <title>Person</title>
       <consumer>Contacts</consumer>
       <linkedContext>Person</linkedContext>
+      <mandatory v="true" />
     </entityField>
     <entityField>
       <name>SALESPROJECT_ID</name>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 2030ef770a5..2ed0a5850b8 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -18,6 +18,7 @@
       <title>Time</title>
       <contentType>TEXT</contentType>
       <mandatory v="true" />
+      <titleProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/titleProcess.js</titleProcess>
       <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
       <onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/onValidation.js</onValidation>
     </entityField>
diff --git a/entity/Timetracking_entity/entityfields/minutes/titleProcess.js b/entity/Timetracking_entity/entityfields/minutes/titleProcess.js
new file mode 100644
index 00000000000..c089b7246e8
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/minutes/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(translate.text("Time in minutes"));
+}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 8a08edeeb57..a4180005abf 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2574,6 +2574,12 @@
     <entry>
       <key>${QUANTITY_LOWER_THAN_1}</key>
     </entry>
+    <entry>
+      <key>This combination of person and organisation does already exist and can not be created once more.</key>
+    </entry>
+    <entry>
+      <key>Time in minutes</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 08fc72b7af6..7fe597e0828 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3319,6 +3319,10 @@
       <key>VAT in %</key>
       <value>UmsSt. in %</value>
     </entry>
+    <entry>
+      <key>Time in minutes</key>
+      <value>Zeit in Minuten</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 9007ab8c787..eec3b184f04 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2599,6 +2599,12 @@
       <key>${QUANTITY_LOWER_THAN_1}</key>
       <value>Quantity should be greater than 0.</value>
     </entry>
+    <entry>
+      <key>This combination of person and organisation does already exist and can not be created once more.</key>
+    </entry>
+    <entry>
+      <key>Time in minutes</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab