refactorings

entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js

@@ -4,7 +4,7 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var contractType = KeywordUtils.getViewValue($KeywordRegistry.contractType(), vars.get("$field.CONTRACTTYPE"));
+var contractType = vars.getString("$field.CONTRACTTYPE.displayValue");
 var contractCode = vars.get("$field.CONTRACTCODE");
 
 result.string((contractType || translate.text("Contract")) + " " + contractCode);
\ No newline at end of file

entity/Contract_entity/entityfields/image/valueProcess.js

 import("system.vars");
 import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
 
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.contractType(), vars.getString("$field.CONTRACTTYPE")) );
+result.string("TEXT:" + vars.getString("$field.CONTRACTTYPE.displayValue"));
\ No newline at end of file

entity/Offer_entity/Offer_entity.aod

@@ -728,30 +728,23 @@
       <onDBDelete>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
-          <name>19634909-a0a3-4fde-b875-e3b2b254e890</name>
+          <name>fdfae1fd-5eb3-4891-86b7-517803035f23</name>
           <tableName>OFFER</tableName>
           <primaryKey>OFFERID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
         <linkInformation>
-          <name>1b7e5346-a8ce-4ef6-a227-a4557cba3294</name>
+          <name>d49d4390-5567-449b-8702-ee97dbfe1700</name>
           <tableName>CONTACT</tableName>
           <primaryKey>CONTACTID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="true" />
         </linkInformation>
         <linkInformation>
-          <name>9c8f49ae-399f-49e8-a18a-fb4b84a360d0</name>
-          <tableName>ORGANISATION</tableName>
-          <primaryKey>ORGANISATIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>35ac875d-66c4-43b0-9293-b034f45260c8</name>
-          <tableName>PERSON</tableName>
-          <primaryKey>PERSONID</primaryKey>
+          <name>d165322e-cdf3-4611-9fea-0e100853ae80</name>
+          <tableName>SALESPROJECT</tableName>
+          <primaryKey>SALESPROJECTID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="true" />
         </linkInformation>
@@ -873,6 +866,10 @@
           <name>DATE_EDIT.value</name>
           <recordfield>OFFER.DATE_EDIT</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.displayValue</name>
+          <recordfield>SALESPROJECT.PROJECTTITLE</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>

entity/Offer_entity/entityfields/image/valueProcess.js

 import("system.vars");
 import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
 
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.offerStatus(), vars.getString("$field.STATUS")) );
+result.string("TEXT:" + vars.get("$field.STATUS.displayValue"));
\ No newline at end of file

entity/Offer_entity/recordcontainers/db/fromClauseProcess.js

 import("system.result");
 
 result.string("OFFER left join CONTACT on CONTACTID = CONTACT_ID \n\
-left join ORGANISATION on ORGANISATIONID = ORGANISATION_ID left join PERSON on PERSONID = PERSON_ID");
+left join SALESPROJECT on SALESPROJECTID = SALESPROJECT_ID");
\ No newline at end of file

entity/Order_entity/Order_entity.aod

@@ -456,30 +456,23 @@
       <onDBDelete>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
-          <name>f84d86a8-867d-44ea-bce5-3489bbee55a0</name>
+          <name>c1a83567-58d0-44bd-ae08-14018311a6ae</name>
           <tableName>SALESORDER</tableName>
           <primaryKey>SALESORDERID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
         <linkInformation>
-          <name>2c489a72-00ee-4bad-929f-25ef82dbc714</name>
+          <name>7d433584-df9f-4b5b-bae4-f3b0a1962d59</name>
           <tableName>CONTACT</tableName>
           <primaryKey>CONTACTID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="true" />
         </linkInformation>
         <linkInformation>
-          <name>3888fb8c-6d2a-42e6-8abd-e4a9ac7a74ac</name>
-          <tableName>ORGANISATION</tableName>
-          <primaryKey>ORGANISATIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>75470798-2097-41a2-95c2-22cf80d2f0c4</name>
-          <tableName>PERSON</tableName>
-          <primaryKey>PERSONID</primaryKey>
+          <name>33653e5e-df52-413c-9a91-349fd989ab89</name>
+          <tableName>SALESPROJECT</tableName>
+          <primaryKey>SALESPROJECTID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="true" />
         </linkInformation>
@@ -565,6 +558,10 @@
           <name>OFFER_ID.value</name>
           <recordfield>SALESORDER.OFFER_ID</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.displayValue</name>
+          <recordfield>SALESPROJECT.PROJECTTITLE</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>

entity/Order_entity/entityfields/image/valueProcess.js

 import("system.vars");
 import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
 
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.salesorderState(), vars.getString("$field.STATUS")) );
+result.string("TEXT:" + vars.getString("$field.STATUS.displayValue"));

entity/Order_entity/entityfields/status/displayValueProcess.js

-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesorderState(), vars.get("$field.STATUS")));
+import("system.logging");
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+logging.log("loadState")
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesorderState(), vars.get("$field.STATUS")));

entity/Order_entity/recordcontainers/db/fromClauseProcess.js

 import("system.result");
 
-result.string("SALESORDER left join CONTACT on CONTACTID = CONTACT_ID left join ORGANISATION on ORGANISATIONID = ORGANISATION_ID");
+result.string("SALESORDER left join CONTACT on CONTACTID = CONTACT_ID \n\
\ No newline at end of file
+left join SALESPROJECT on SALESPROJECTID = SALESPROJECT_ID");
\ No newline at end of file

entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js

@@ -2,5 +2,4 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS");
-result.string(sql);
+result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS"));

entity/Productprice_entity/entityfields/image/valueProcess.js

 import("system.vars");
 import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
 
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.productPricelist(), vars.getString("$field.PRICELIST")));
+result.string("TEXT:" + vars.getString("$field.PRICELIST.displayValue"));
\ No newline at end of file

entity/Salesproject_entity/entityfields/image/valueProcess.js

 import("system.vars");
 import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
 
 result.string("TEXT:" +  vars.getString("$field.PROJECTTITLE"));
\ No newline at end of file

entity/Stock_entity/entityfields/image/valueProcess.js

 import("system.translate");
 import("system.vars");
 import("system.result");
-import("Keyword_lib");
 
 result.string("TEXT:" + (vars.get("$field.IN_OUT") == "1" ? translate.text("IN") : translate.text("OUT") ) );
\ No newline at end of file