fixed attributes for payment terms. Das Zahlungsziel wird je nach Zahlungsbedingung vorbelegt. +

added addresses

.liquibase/Data_alias/basic/2019.1.4/Salesorder_Payment_DayNumber.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="m.mansour" id="13c8eaf7-39d2-41c0-aff4-9cca30d32422">
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="b5a322c7-41a0-4713-b90a-3c3151833f8d"/>
+            <column name="NAME" value="dayNumber"/>
+            <column name="CONTAINER" value="PaymentTerm"/>
+            <column name="TYPE" value="NUMBER_VALUE"/>
+        </insert>
+
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="eb80b4ae-f931-4000-9e48-ee9da528efa5"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="b8409c4a-6447-408a-bd06-dfe67054a4f1"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="b5a322c7-41a0-4713-b90a-3c3151833f8d"/>
+            <column name="NUMBER_VALUE" valueNumeric="7"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="f9a1bdf4-15a6-48d7-a427-34845320cab8"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="edba1a8f-766b-4dfa-9360-1a2aca8569d6"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="b5a322c7-41a0-4713-b90a-3c3151833f8d"/>
+            <column name="NUMBER_VALUE" valueNumeric="30"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="47140d0b-7820-469d-929d-d6d6f0513899"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="ed1b3d39-9cab-4c3c-84c5-438a8b67be53"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="b5a322c7-41a0-4713-b90a-3c3151833f8d"/>
+            <column name="NUMBER_VALUE" valueNumeric="38"/>
+        </insert>
+        
+       
+    </changeSet>
+</databaseChangeLog>

.liquibase/Data_alias/basic/2019.1.4/changelog.xml

@@ -190,4 +190,6 @@
     <include relativeToChangelogFile="true" file="Salesorder/create_dunninglevel_keyword.xml"/>
     <include relativeToChangelogFile="true" file="Salesorder/update_Salesorder.xml"/>
     <include relativeToChangelogFile="true" file="Salesorder/Salesorder_terms.xml"/>
+    <include relativeToChangelogFile="true" file="Salesproject_Phase_LongNames.xml"/>
+    <include relativeToChangelogFile="true" file="Salesorder_Payment_DayNumber.xml"/>
 </databaseChangeLog>

entity/Address_entity/Address_entity.aod

@@ -241,6 +241,12 @@
           <fieldName>PossibleAddresses</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>2f162626-bd99-4e2a-b9cf-e95864d9ed0e</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>PossibleAddresses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>

entity/Order_entity/Order_entity.aod

@@ -46,6 +46,7 @@
       <mandatory v="true" />
       <stateProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>SALESORDERID</name>
@@ -509,11 +510,18 @@
       <name>PAYDATE</name>
       <title>Pay date</title>
       <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <stateProcess>%aditoprj%/entity/Order_entity/entityfields/paydate/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/paydate/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>PAYDUEDATE</name>
       <title>Pay due date</title>
       <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <selectionModeProcess>%aditoprj%/entity/Order_entity/entityfields/payduedate/selectionModeProcess.js</selectionModeProcess>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/payduedate/valueProcess.js</valueProcess>
     </entityField>
     <entityConsumer>
       <name>KeywordOrderTypes</name>
@@ -632,6 +640,10 @@
     </entityField>
     <entityField>
       <name>PAYMENTADDRESS</name>
+      <title>Payment address</title>
+      <consumer>PossibleAddresses</consumer>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentaddress/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentaddress/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityConsumer>
       <name>KeywordPaymentTerms</name>
@@ -661,6 +673,20 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityConsumer>
+      <name>PossibleAddresses</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Address_entity</entityName>
+        <fieldName>OrganisationAndContactAddresses</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Order_entity/entityfields/cancellation/valueProcess.js

-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW&& vars.get("$this.value") == null)
     result.string("0");
\ No newline at end of file

entity/Order_entity/entityfields/dunningdate/stateProcess.js

@@ -3,7 +3,7 @@ import("system.vars");
 import("system.neon");
 import("KeywordRegistry_basic")
 
-if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice())
+if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice() || neon.OPERATINGSTATE_NEW )
     result.string(neon.COMPONENTSTATE_AUTO);
 else
     result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file

entity/Order_entity/entityfields/dunninglevel/stateProcess.js

@@ -3,7 +3,7 @@ import("system.vars");
 import("system.neon");
 import("KeywordRegistry_basic")
 
-if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice())
+if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice()|| neon.OPERATINGSTATE_NEW)
     result.string(neon.COMPONENTSTATE_AUTO);
 else
     result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file

entity/Order_entity/entityfields/orderstatus/valueProcess.js

-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
     result.string("0");
\ No newline at end of file

entity/Order_entity/entityfields/ordertype/valueProcess.js

@@ -9,6 +9,5 @@ import("Contact_lib");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
 {
-   
-        result.string(KeywordUtils.getFirst($KeywordRegistry.orderType()));
+    result.string(KeywordUtils.getFirst($KeywordRegistry.orderType()));
 }
\ No newline at end of file

entity/Order_entity/entityfields/paydate/stateProcess.js

+import("system.result");
+import("system.vars");
+import("system.neon");
+import("KeywordRegistry_basic")
+
+if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$confirmation()|| neon.OPERATINGSTATE_NEW)
+    result.string(neon.COMPONENTSTATE_AUTO);
+else
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file

entity/Order_entity/entityfields/paydate/valueProcess.js

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

entity/Order_entity/entityfields/payduedate/valueProcess.js

+import("system.datetime");
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+
+var days= KeywordUtils.getAttributeRelation(vars.get("$field.PAYMENTTERMS"), "PaymentTerm", "dayNumber", "0");
+result.string(parseInt(vars.get("$field.PAYDATE")) + datetime.ONE_DAY * parseInt(days));
\ No newline at end of file

entity/Order_entity/entityfields/paymentaddress/displayValueProcess.js

+import("system.vars");
+import("PostalAddress_lib");
+import("system.result");
+
+result.string(AddressUtils.getFormattedOnlineAddressById(vars.get("$this.value")))
\ No newline at end of file

entity/Order_entity/entityfields/paymentaddress/valueProcess.js

+import("Contact_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && !vars.get("$field.ADDRESS"))
+{
+    var defaultAddressId = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID"));
+    if (defaultAddressId)
+        result.string(defaultAddressId);
+}
\ No newline at end of file

entity/Order_entity/entityfields/paymentterms/valueProcess.js

@@ -7,25 +7,27 @@ import("system.result");
 import("system.vars");
 import("Attribute_lib");
 
-if (vars.exists("$param.OfferPaymentTerm_param") && vars.get("$param.OfferPaymentTerm_param")) 
-{
-    result.string(vars.get("$param.OfferPaymentTerm_param"));
-}
-else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    var presetValue = "";
-    var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
-    if (contactIds.length >= 3 && contactIds[2])
+if (vars.get("$this.value") == null) {
+    if (vars.exists("$param.OfferPaymentTerm_param") && vars.get("$param.OfferPaymentTerm_param")) 
+    {
+        result.string(vars.get("$param.OfferPaymentTerm_param"));
+    }
+    else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
     {
-        var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
-        if (orgContactId)
-        { 
-            presetValue = AttributeRelationUtils.getAttribute($AttributeRegistry.paymentTerm(), orgContactId);
+        var presetValue = "";
+        var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
+        if (contactIds.length >= 3 && contactIds[2])
+        {
+            var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
+            if (orgContactId)
+            { 
+                presetValue = AttributeRelationUtils.getAttribute($AttributeRegistry.paymentTerm(), orgContactId);
+            }
         }
+
+        if (presetValue)
+            result.string(presetValue);
+        else
+            result.string(KeywordUtils.getFirst($KeywordRegistry.paymentTerm()));
     }
-    
-    if (presetValue)
-        result.string(presetValue);
-    else
-        result.string(KeywordUtils.getFirst($KeywordRegistry.paymentTerm()));
-}
\ No newline at end of file
+}

entity/Order_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js

+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file

entity/Order_entity/entityfields/salesorderdate/stateProcess.js

-import("system.result");
-import("system.vars");
-import("system.neon");
-import("KeywordRegistry_basic")
-
-if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$confirmation())
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
-else
-    result.string(neon.COMPONENTSTATE_AUTO);
\ No newline at end of file

entity/Order_entity/entityfields/salesorderdate/valueProcess.js

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