Merge origin/master

Conflicts:
	preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

entity/Offer_entity/entityfields/user_new/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file

entity/Org_entity/Org_entity.aod

@@ -202,6 +202,12 @@
           <fieldName>ProductOrg_dfo</fieldName>
           <isOutgoing v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>a6e1d9a2-9079-4415-b56f-865df5170d5e</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>SalesprojectOrg_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
       </dependencies>
     </entityIncomingField>
     <entityOutgoingField>

entity/Pers_entity/entityfields/orgname/onValueChange.js

@@ -9,7 +9,7 @@ logging.log("value change -> " + org_id);
 
 if(org_id != '')
 {
-    neon.setFieldValue("$field.ORG_ID", org_id);            
+    vars.set("$field.ORG_ID", org_id);            
 
     var org_name = db.cell("select NAME from ORG where ORGID = '" + org_id + "'");
     vars.set("$image.lookup_orgname", org_name);

entity/Product_entity/Product_entity.aod

@@ -60,7 +60,7 @@
       <name>PRODUCTCODE</name>
       <tableName>PRODUCT</tableName>
       <columnName>PRODUCTCODE</columnName>
-      <caption>Product no.</caption>
+      <caption>Product number</caption>
       <mandatory v="true" />
       <onValidation>%aditoprj%/entity/Product_entity/entityfields/productcode/onValidation.js</onValidation>
     </entityField>

entity/Product_entity/entityfields/date_new/valueProcess.js

-import("system.logging");
 import("system.vars");
 import("system.result");
 import("system.neon");

entity/Salesproject_entity/Salesproject_entity.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
+  <name>Salesproject_entity</name>
+  <title>Salesproject</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <alias>Data_alias</alias>
+  <recordContainerType>DB</recordContainerType>
+  <caption>Salesproject</caption>
+  <iconId>VAADIN:FILTER</iconId>
+  <entityFields>
+    <entityIncomingField>
+      <name>#INCOMING</name>
+    </entityIncomingField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>DATE_EDIT</columnName>
+      <contentType>DATE</contentType>
+      <outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>DATE_NEW</columnName>
+      <contentType>DATE</contentType>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ENDDATE</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>ENDDATE</columnName>
+      <caption>Rollout</caption>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/enddate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ESTIMATION</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>ESTIMATION</columnName>
+      <caption>Estimation</caption>
+    </entityField>
+    <entityField>
+      <name>ESTIMATIONVALUE</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>ESTIMATIONVALUE</columnName>
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>INFO</columnName>
+      <caption>Information</caption>
+    </entityField>
+    <entityField>
+      <name>PHASE</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>PHASE</columnName>
+      <caption>Phase</caption>
+      <mandatory v="true" />
+      <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js</possibleItemsProcess>
+    </entityField>
+    <entityField>
+      <name>PROJECTCODE</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>PROJECTCODE</columnName>
+      <caption>Project number</caption>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/onValidation.js</onValidation>
+      <onValueChange>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/onValueChange.js</onValueChange>
+    </entityField>
+    <entityField>
+      <name>PROJECTTITLE</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>PROJECTTITLE</columnName>
+      <caption>Project title</caption>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>RELATION_ID</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>RELATION_ID</columnName>
+      <caption>Company</caption>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>SALESPROJECTID</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>SALESPROJECTID</columnName>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STARTDATE</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>STARTDATE</columnName>
+      <caption>Project start</caption>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startdate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>STATUS</columnName>
+      <caption>Status</caption>
+      <mandatory v="true" />
+      <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>USER_EDIT</columnName>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>USER_NEW</columnName>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>VOLUME</name>
+      <tableName>SALESPROJECT</tableName>
+      <columnName>VOLUME</columnName>
+      <caption>Volume</caption>
+    </entityField>
+    <entityOutgoingField>
+      <name>SalesprojectOrg_dfo</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Org_entity</entityName>
+        <fieldName>Org_dfi</fieldName>
+      </dependency>
+    </entityOutgoingField>
+  </entityFields>
+  <linkInformation>
+    <linkInformation>
+      <name>a343a42f-d810-492e-a93f-3ffcab9a88bd</name>
+      <tableName>SALESPROJECT</tableName>
+      <primaryKey>SALESPROJECTID</primaryKey>
+      <isUIDTable v="true" />
+    </linkInformation>
+  </linkInformation>
+</entity>

entity/Salesproject_entity/entityfields/date_edit/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file

entity/Salesproject_entity/entityfields/date_new/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file

entity/Salesproject_entity/entityfields/enddate/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Date_lib");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
+{
+    var DateUtils = new DateUtils();
+    result.string(DateUtils.getDateIncrementedByYears(DateUtils.getTodayUTC(), 1));
+}
+else
+    result.string(vars.get("$this.value"));
\ No newline at end of file

entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js

+import("system.result");
+import("Keyword_lib");
+
+var kwdUtils, items;
+
+kwdUtils = new KeywordUtils();
+items = kwdUtils.getStandardArray("SALESPROJECT.PHASE");
+result.object(items);
\ No newline at end of file

entity/Salesproject_entity/entityfields/projectcode/onValidation.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Salesproject_lib");
+
+var SalesprojectUtils = new SalesprojectUtils();
+
+if( !SalesprojectUtils.validateProjectNumber(vars.get("$local.value")) )
+{
+    result.string(SalesprojectUtils.getProjectNumberValidationFailString());
+}
\ No newline at end of file

entity/Salesproject_entity/entityfields/projectcode/onValueChange.js

+import("system.vars");
+import("system.result");
+import("Salesproject_lib");
+
+var SalesprojectUtils = new SalesprojectUtils();
+if( !SalesprojectUtils.validateProjectNumber(vars.get("$local.value")) )
+{
+    vars.set("$field.PROJECTCODE", SalesprojectUtils.getNextProjectNumber());
+}

entity/Salesproject_entity/entityfields/projectcode/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Salesproject_lib");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    var SalesprojectUtils = new SalesprojectUtils();
+    
+    result.string( SalesprojectUtils.getNextProjectNumber() );
+}
\ No newline at end of file

entity/Salesproject_entity/entityfields/salesprojectid/valueProcess.js

+import("system.util");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(util.getNewUUID());
\ No newline at end of file

entity/Salesproject_entity/entityfields/startdate/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Date_lib");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
+{
+    var DateUtils = new DateUtils();
+    result.string(DateUtils.getTodayUTC());
+}
+else
+    result.string(vars.get("$this.value"));
\ No newline at end of file

entity/Salesproject_entity/entityfields/status/possibleItemsProcess.js

+import("system.result");
+import("Keyword_lib");
+
+var kwdUtils, items;
+
+kwdUtils = new KeywordUtils();
+items = kwdUtils.getStandardArray("SALESPROJECT.STATUS");
+result.object(items);
\ No newline at end of file

entity/Salesproject_entity/entityfields/user_edit/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file

entity/Salesproject_entity/entityfields/user_new/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file

entity/Social_entity/Social_entity.aod

@@ -35,7 +35,7 @@
       <name>Account_param</name>
       <title>Benutzer</title>
       <expose v="true" />
-      <description>PARAMETER</description>
+      <description>Benutzer</description>
     </entityParameter>
   </entityFields>
 </entity>

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -537,6 +537,129 @@
     <entry>
       <key>Quantity</key>
     </entry>
+    <entry>
+      <key>Current purchase/sales price</key>
+    </entry>
+    <entry>
+      <key>Salesproject</key>
+    </entry>
+    <entry>
+      <key>Rollout</key>
+    </entry>
+    <entry>
+      <key>Estimation</key>
+    </entry>
+    <entry>
+      <key>Phase</key>
+    </entry>
+    <entry>
+      <key>Product number</key>
+    </entry>
+    <entry>
+      <key>Project number</key>
+    </entry>
+    <entry>
+      <key>Project title</key>
+    </entry>
+    <entry>
+      <key>Project start</key>
+    </entry>
+    <entry>
+      <key>Volume</key>
+    </entry>
+    <entry>
+      <key>The project number already exists!</key>
+    </entry>
+    <entry>
+      <key>Partial order</key>
+    </entry>
+    <entry>
+      <key>Open</key>
+    </entry>
+    <entry>
+      <key>Lost</key>
+    </entry>
+    <entry>
+      <key>Order</key>
+    </entry>
+    <entry>
+      <key>Postponed</key>
+    </entry>
+    <entry>
+      <key>Aborted</key>
+    </entry>
+    <entry>
+      <key>Negotiation</key>
+    </entry>
+    <entry>
+      <key>Workshop</key>
+    </entry>
+    <entry>
+      <key>Presentation preparation</key>
+    </entry>
+    <entry>
+      <key>Waiting for request</key>
+    </entry>
+    <entry>
+      <key>Specifications in progress</key>
+    </entry>
+    <entry>
+      <key>Project decision</key>
+    </entry>
+    <entry>
+      <key>Lead</key>
+    </entry>
+    <entry>
+      <key>Presentation postprocessing</key>
+    </entry>
+    <entry>
+      <key>Statement given</key>
+    </entry>
+    <entry>
+      <key>Total net</key>
+    </entry>
+    <entry>
+      <key>Offer</key>
+    </entry>
+    <entry>
+      <key>Offer number</key>
+    </entry>
+    <entry>
+      <key>Probability</key>
+    </entry>
+    <entry>
+      <key>Total VAT</key>
+    </entry>
+    <entry>
+      <key>Person / Firma</key>
+    </entry>
+    <entry>
+      <key>The offer number already exists!</key>
+    </entry>
+    <entry>
+      <key>0 %</key>
+    </entry>
+    <entry>
+      <key>75 %</key>
+    </entry>
+    <entry>
+      <key>100 %</key>
+    </entry>
+    <entry>
+      <key>25 %</key>
+    </entry>
+    <entry>
+      <key>50 %</key>
+    </entry>
+    <entry>
+      <key>Won</key>
+    </entry>
+    <entry>
+      <key>Checked</key>
+    </entry>
+    <entry>
+      <key>Sent</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>