Offer & Contract performance fixes

entity/Contract_entity/Contract_entity.aod

@@ -480,6 +480,10 @@
           <name>CONTACT_PERSON_ID.displayValue</name>
           <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contact_person_id.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
     <indexRecordContainer>

entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js

@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 import("Contact_lib");
 
-result.string(ContactUtils.getContextByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getContextByPersOrg(vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID")));
\ No newline at end of file

entity/Contract_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js

+import("system.vars");
+import("Contact_lib");
+import("system.result");
+
+var contact = Contact.createWithColumnPreset()
+var renderer = new ContactTitleRenderer(contact, ContactTitleRenderer.OPTIONS.IncludeOrganisation);
+result.string(renderer.asSql());
\ No newline at end of file

entity/Offer_entity/Offer_entity.aod

@@ -199,7 +199,6 @@
       <name>printOffer</name>
       <title>Print Offer</title>
       <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/onActionProcess.js</onActionProcess>
-      <isMenuAction v="false" />
       <iconId>VAADIN:FILE_TEXT_O</iconId>
       <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/stateProcess.js</stateProcess>
     </entityActionField>