Merge branch '2020.1'

aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod

@@ -1712,7 +1712,7 @@
           <entityDb>
             <name>ASYS_PERMISSIONSET</name>
             <dbName></dbName>
-            <idColumn>PERMISSIONSETID</idColumn>
+            <idColumn>ASYS_PERMISSIONSETID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -1816,7 +1816,7 @@
           <entityDb>
             <name>ASYS_PERMISSIONACTION</name>
             <dbName></dbName>
-            <idColumn>PERMISSIONACTIONID</idColumn>
+            <idColumn>ASYS_PERMISSIONACTIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>

entity/Activity_entity/Activity_entity.aod

@@ -488,11 +488,6 @@
         <entityName>Appointment_entity</entityName>
         <fieldName>LinkedAppointments</fieldName>
       </dependency>
-      <children>
-        <entityParameter>
-          <name>LinkedObjectId_param</name>
-        </entityParameter>
-      </children>
     </entityConsumer>
     <entityActionField>
       <name>newSupportticket</name>

entity/Activity_entity/entityfields/attributes/children/objectrowid_param/code.js

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

entity/Activity_entity/entityfields/attributes/children/objecttype_param/code.js

-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file

entity/Activity_entity/entityfields/keywordcategory/children/containername_param/valueProcess.js

-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.activityCategory());
\ No newline at end of file

entity/Activity_entity/entityfields/link/children/activityid_param/valueProcess.js

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

entity/Activity_entity/entityfields/moduletrees/children/contextname/valueProcess.js

-import("system.result");
-
-result.string("Activity");
\ No newline at end of file

entity/Activity_entity/entityfields/newmail/onActionProcess.js

-import("system.db");
-import("system.vars");
-import("system.neon");
-import("KeywordRegistry_basic");
-
-
-var params = {
-    "DocumentTemplateType_param" : $KeywordRegistry.documentTemplateType$mail()
-}
-
-//neon.openContext("DocumentTemplate", "DocumentTemplateFilterSmall_view", null, neon.OPERATINGSTATE_SEARCH, params);
-//neon.openContext("DocumentTemplate", "DocumentTemplateFilterSmall_view", null, null, null, params);
-neon.openContext("DocumentTemplate", null, null, neon.OPERATINGSTATE_SEARCH, params);
-

entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js

-import("WsValidation_lib");
-import("system.result");
-
-result.string(AddressValidationType.get().TYPE_CITY_NOMINATIM.key);
\ No newline at end of file

entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js

-import("WsValidation_lib");
-import("system.result");
-
-result.string(AddressValidationType.get().TYPE_ZIP_NOMINATIM.key);
\ No newline at end of file

entity/Address_entity/Address_entity.aod

@@ -451,6 +451,7 @@
     </entityField>
     <entityProvider>
       <name>QuickEntryAdresses</name>
+      <documentation>%aditoprj%/entity/Address_entity/entityfields/quickentryadresses/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>d677a301-2038-4ccd-baa1-5f986e290564</name>

entity/Address_entity/conditionProcess.js

-import("Sql_lib");
-import("system.db");
-import("system.result");
-
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(newWhereIfSet("ADDRESS.CONTACT_ID", "$param.ContactId_param").toString());

entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js

-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.addressType());
\ No newline at end of file

entity/Address_entity/entityfields/orgaddresses/children/contacttype_param/code.js

-import("system.result");
-
-result.object(1);
\ No newline at end of file

entity/Address_entity/entityfields/persaddresses/children/contacttype_param/code.js

-import("system.result");
-
-result.object(2);
\ No newline at end of file

entity/Address_entity/entityfields/quickentryadresses/documentation.adoc

+= QuickEntry_entity - Addresses
+
+Provides all addresses for QuickEntry
\ No newline at end of file

entity/Address_entity/recordcontainers/childgroup/affectedIds.js

-import("system.vars");
-import("system.result");
-
-result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file

entity/Address_entity/recordcontainers/childgroup/query.js

-import("Sql_lib");
-import("system.db");
-import("system.result");
-import("system.vars");
-
-var affectedIds;
-if (vars.exists("$local.idvalue")) {
-    affectedIds = vars.get("$local.idvalue");
-}
-
-var addressSelect = newSelect("ADDRESS.ADDRESSID as \"_uid_\", \n\
-                               ADDRESS.ADDRESSID, \n\
-                               ADDRESS.ZIP as ZIP, \n\
-                               ADDRESS.CITY as CITY, \n\
-                               ADDRESS.COUNTRY, \n\
-                               ADDRESS.ADDRESS, \n\
-                               ADDRESS.BUILDINGNO")
-                            .from("ADDRESS")
-                            .whereIfSet("ADDRESS.ADDRESSID", affectedIds, SqlBuilder.IN())
-                            .orderBy("ADDRESS.ADDRESSID")
-
-result.string(addressSelect.toString("1=2"));
\ No newline at end of file

entity/AnyContact_entity/AnyContact_entity.aod

@@ -107,7 +107,6 @@
       <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
 See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <contentType>NUMBER</contentType>
-      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>ORGANISATION_NAME</name>

entity/AnyContact_entity/entityfields/contacttype/valueProcess.js

-import("system.result");
-import("system.vars");
-import("Contact_lib")
-
-result.object(ContactUtils.getContactType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file