fix salesprojext

entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js

 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

entity/Salesproject_entity/Salesproject_entity.aod

@@ -83,7 +83,8 @@
       <name>VOLUME</name>
       <title>Volume</title>
       <description>The displayValue from the recoord container adds T € (translated)</description>
-      <contentTypeProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js</contentTypeProcess>
+      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/volume/onValidation.js</onValidation>
     </entityField>
     <entityConsumer>
       <name>Organisations</name>
@@ -501,10 +502,6 @@
           <name>CONTACT_ID.displayValue</name>
           <recordfield>ORGANISATION.NAME</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VOLUME.displayValue</name>
-          <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PROBABILITY.displayValue</name>
           <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>

entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js

-import("system.result");
-import("system.vars");
-import("system.neon");
-
-var recordState = vars.get("$sys.recordstate");
-if (recordState == neon.OPERATINGSTATE_EDIT || recordState == neon.OPERATINGSTATE_NEW)
-{
-    result.string("NUMBER");
-}
-else
-{
-    result.string("TEXT");
-}
\ No newline at end of file

entity/Salesproject_entity/entityfields/volume/displayValueProcess.js

+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

entity/Salesproject_entity/entityfields/volume/onValidation.js

+import("system.translate");
+import("system.result");
+import("system.vars");
+import("PostalAddress_lib");
+import("Entity_lib");
+
+// TODO: displayValue + contentType number crashes so we use TEXT and validate ourselve
+// Workaround for 1035861
+
+var volume =  ProcessHandlingUtils.getOnValidationValue(vars.get("$field.VOLUME"));
+var message = "";
+if (!/^\d+$/.test(volume))
+    message = translate.text("Only numbers are allowed.");
+    
+result.string(message);
\ No newline at end of file

entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js

-import("system.translate");
-import("system.result");
-import("Sql_lib");
-
-var maskingUtils = new SqlMaskingUtils();
-result.string(maskingUtils.concat(["char(SALESPROJECT.VOLUME)", "'" + translate.text("${THOUSAND_SHORT}") + "'", "'" + translate.text("${EURO_SIGN}") + "'"], " ", true))
\ No newline at end of file

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -2532,6 +2532,15 @@
     <entry>
       <key>Only numbers are allowed.</key>
     </entry>
+    <entry>
+      <key>Superordinate Attribute</key>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_OFFER}</key>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_NEGOTIATION}</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -58,6 +58,10 @@
       <key>Communication data</key>
       <value>Kommunikationsdaten</value>
     </entry>
+    <entry>
+      <key>${SALESPROJECT_NEGOTIATION}</key>
+      <value>Negotiation</value>
+    </entry>
     <entry>
       <key>Male</key>
       <value>Männlich</value>
@@ -86,6 +90,10 @@
       <key>Time expenses</key>
       <value>Aufwand</value>
     </entry>
+    <entry>
+      <key>${SALESPROJECT_OFFER}</key>
+      <value>Offer</value>
+    </entry>
     <entry>
       <key>Status</key>
       <value>Status</value>
@@ -2962,6 +2970,9 @@
       <key>Only numbers are allowed.</key>
       <value>Es sind nur Zahlen erlaubt.</value>
     </entry>
+    <entry>
+      <key>Parent Attribute</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -2556,6 +2556,17 @@
     <entry>
       <key>Only numbers are allowed.</key>
     </entry>
+    <entry>
+      <key>Superordinate Attribute</key>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_OFFER}</key>
+      <value>Offer</value>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_NEGOTIATION}</key>
+      <value>Negotiation</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

others/db_changes/data_alias/basic/2019.2/fix_sp_phases.xml

@@ -25,6 +25,22 @@
             <column name="ISESSENTIAL" valueNumeric="0"/>
         </insert>
         
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="${SALESPROJECT_OFFER}"/>
+            <where>AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="0e8eab64-4c79-4eed-9746-0ac6fc397620"/>
+            </whereParams>
+        </update>
+                
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="${SALESPROJECT_NEGOTIATION}"/>
+            <where>AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="405e2b7b-20c2-4824-a8b5-c7a533784ef3"/>
+            </whereParams>
+        </update>
+        
         <sql>update AB_KEYWORD_ENTRY set SORTING = SORTING+1 where AB_KEYWORD_ENTRYID in (
             '8a2d19c9-bc32-437e-9261-78ed30110e92',
             '46f55a58-dbe4-40ae-9306-481df9095088',