merged 2021.2 into #1073411_translations

e8e8014b · Simon Leipold · 8d7ea884 · a64a3b57 · e8e8014b · e8e8014b
Commit e8e8014b authored 3 years ago by Simon Leipold
--- a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
@@ -13,4 +13,4 @@
    <include relativeToChangelogFile="true" file="EwsContactSync/changelog.xml"/>
    <include relativeToChangelogFile="true" file="Export/changelog.xml"/>
    <include relativeToChangelogFile="true" file="insert_ProductGroupcode.xml"/>
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.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">
+    <include relativeToChangelogFile="true" file="insertBulkMailSenderAddressKeyword.xml"/>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.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.groppe" id="50badea9-da46-4aa0-94ed-a2c3db2874ac">
+        <insert tableName="AB_KEYWORD_CATEGORY">
+            <column name="AB_KEYWORD_CATEGORYID" value="3f31d08d-bf59-4bb7-9e96-7f026571cb79"/>
+            <column name="NAME" value="BulkmailSenderAddress"/>
+            <column name="SORTINGBY" valueNumeric="0"/>
+            <column name="SORTINGDIRECTION" value="ASC"/>
+        </insert>
+
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="c4773a13-314d-4f00-a7d3-ab65947586ba"/>
+            <column name="KEYID" value="news@adito.de"/>
+            <column name="TITLE" value="news@adito.de"/>
+            <column name="CONTAINER"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="3f31d08d-bf59-4bb7-9e96-7f026571cb79"/>
+        </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/Mosaico/insert_mosaico_color_keyword.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/insert_mosaico_color_keyword.xml
@@ -17,7 +17,7 @@
        <column name="CONTAINER" value="MosaicoColor"/>
        <column name="SORTING" valueNumeric="1"/>
        <column name="ISACTIVE" valueNumeric="1"/>
-        <column name="ISESSENTIAL" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
    </insert>
    <insert tableName="AB_KEYWORD_ENTRY">
        <column name="AB_KEYWORD_ENTRYID" value="6f3b9635-679c-47b4-9fe3-0770aaca719c"/>
@@ -27,7 +27,7 @@
        <column name="CONTAINER" value="MosaicoColor"/>
        <column name="SORTING" valueNumeric="2"/>
        <column name="ISACTIVE" valueNumeric="1"/>
-        <column name="ISESSENTIAL" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
    </insert>
    <insert tableName="AB_KEYWORD_ENTRY">
        <column name="AB_KEYWORD_ENTRYID" value="b9ce199e-a4e1-4b48-ba61-85ee6139b89c"/>
@@ -37,7 +37,7 @@
        <column name="CONTAINER" value="MosaicoColor"/>
        <column name="SORTING" valueNumeric="3"/>
        <column name="ISACTIVE" valueNumeric="1"/>
-        <column name="ISESSENTIAL" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
    </insert>
    <insert tableName="AB_KEYWORD_ENTRY">
        <column name="AB_KEYWORD_ENTRYID" value="09f299f7-9faa-40c4-a53d-e7b5c33dca53"/>
@@ -47,7 +47,17 @@
        <column name="CONTAINER" value="MosaicoColor"/>
        <column name="SORTING" valueNumeric="4"/>
        <column name="ISACTIVE" valueNumeric="1"/>
-        <column name="ISESSENTIAL" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="692699de-d7ad-4500-b71e-153555a2ceac"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+        <column name="KEYID" value="FFFFFF"/>
+        <column name="TITLE" value="White"/>
+        <column name="CONTAINER" value="MosaicoColor"/>
+        <column name="SORTING" valueNumeric="5"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
    </insert>
  </changeSet>
 </databaseChangeLog>
--- a/.liquibase/Data_alias/basic/2021.2.2/alter_display-name_prospective-customer.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_display-name_prospective-customer.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="5e9314bc-291b-4396-a155-e1a06afcbb1c">
+        <update tableName="AB_ATTRIBUTE">
+            <column name="ATTRIBUTE_NAME" value="Existing customer" />
+            <where>AB_ATTRIBUTEID = 'be3b5fe2-2146-4eab-80a4-3c1cf4d6156a'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="8f556a75-720c-45b6-9cfe-c26308f96a65">
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="completed" />
+            <where>AB_KEYWORD_ENTRYID = '7311d8c5-edf2-492e-be4d-6f0469334611'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="f420d656-da64-4ac2-aa10-8ce529479240">
+        <update tableName="AB_OBJECTRELATIONTYPE">
+            <column name="RELATION_TITLE" value="grandchild of" />
+            <where>AB_OBJECTRELATIONTYPEID = 'a2296f93-2371-4ab8-9f29-ef0795d1e9b2'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/changelog.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">
+    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">
+    <include relativeToChangelogFile="true" file="alter_relation-type-title_grandchildof.xml"/>
+    <include relativeToChangelogFile="true" file="alter_display-value_task-status-completed_keyword.xml"/>
+    <include relativeToChangelogFile="true" file="alter_display-name_prospective-customer.xml"/>
    <include relativeToChangelogFile="true" file="Offer/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="lead_nurturing/changelog.xml"/>
    <include relativeToChangelogFile="true" file="add_offer_showprice.xml"/>
    <include relativeToChangelogFile="true" file="Ticket/changelog.xml"/>
    <include relativeToChangelogFile="true" file="StandardColumns/changelog.xml"/>
@@ -13,4 +18,5 @@
    <include relativeToChangelogFile="true" file="Mosaico/insert_mosaico_color_keyword.xml"/>
    <include relativeToChangelogFile="true" file="Mailbridge/changelog.xml"/>
    <include relativeToChangelogFile="true" file="OfferOrder/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="BulkMail/changelog.xml"/>
 </databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/alter_bulkmail.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/alter_bulkmail.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.groppe" id="1801edd3-72d9-4297-8b9b-7ac14cb57884">
+      <addColumn tableName="BULKMAIL">
+          <column name="CAMPAIGN_ID" type="CHAR(36)"/>
+      </addColumn>
+      <createIndex indexName="IDX_BULKMAIL_CAMPAIGN_ID" tableName="BULKMAIL">
+          <column name="CAMPAIGN_ID" />
+      </createIndex>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/changelog.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">
+    <include relativeToChangelogFile="true" file="alter_bulkmail.xml"/>
+    <include relativeToChangelogFile="true" file="insert_adHocMailBulkMailStatus.xml"/>
+    <include relativeToChangelogFile="true" file="insert_documentTemplateTypeDownload.xml"/>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_adHocMailBulkMailStatus.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_adHocMailBulkMailStatus.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<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.groppe" id="246a1182-ff3c-461a-b533-ae305f0468a6">
+      <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="b0fe2c5e-7195-497c-9a47-5837e0ce30a8"/>
+            <column name="KEYID" value="BULKMAILADHOC"/>
+            <column name="TITLE" value="Ad hoc"/>
+            <column name="CONTAINER" value="BulkMailStatus"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="76fc02b9-a1b6-4c76-bdd5-a52d0e1ef286"/>
+            <column name="SORTING" valueNumeric="6"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+      </insert>
+      <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+          <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="cfb85e46-8af0-432c-a783-251333c999bf"/>
+          <column name="AB_KEYWORD_ATTRIBUTE_ID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+          <column name="AB_KEYWORD_ENTRY_ID" value="b0fe2c5e-7195-497c-9a47-5837e0ce30a8"/>
+          <column name="CHAR_VALUE" value="VAADIN:ENVELOPE_OPEN"/>
+      </insert>
+  </changeSet>
+</databaseChangeLog>
--- a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_documentTemplateTypeDownload.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_documentTemplateTypeDownload.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.groppe" id="212e1f2b-9913-4555-b7d4-74b848c4712e">
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="ec364de4-a2ef-47f0-a9ec-adec4496fbd0"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="b5afd40b-bfa7-4aee-89ea-06b8c7deb304"/>
+        <column name="KEYID" value="DOWNLOAD"/>
+        <column name="TITLE" value="Download"/>
+        <column name="SORTING" valueNumeric="5"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="1"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
@@ -90,7 +90,7 @@
      <column name="HIERARCHY" valueNumeric="0"/>
      <column name="ICON" value="VAADIN:FAMILY"/>
      <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
-      <column name="RELATION_TITLE" value="Grandchild of"/>
+      <column name="RELATION_TITLE" value="grandchild of"/>
    </insert>
    <insert tableName="ab_objectrelationtype">
      <column name="SIDE" valueNumeric="2"/>

--- a/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml
@@ -59,7 +59,7 @@
      <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
      <column name="USER_EDIT" value="Lisa Sommer"/>
      <column name="URL" value="http://www.adito.de"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_NEW" value="Lisa Sommer"/>
      <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
      <column name="SCORE" valueNumeric="0"/>
      <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
@@ -67,5 +67,44 @@
      <column name="ISREDIRECT" valueNumeric="1"/>
      <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
    </insert>
+    <insert tableName="weblink">
+      <column name="WEBLINKID" value="c82da3d0-8156-4dd5-86f2-ad68ea3d11ef"/>
+      <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+      <column name="USER_EDIT" value="Lisa Sommer"/>
+      <column name="URL" value="https://www.adito.de/unternehmen/philosophie.html"/>
+      <column name="USER_NEW" value="Lisa Sommer"/>
+      <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
+      <column name="SCORE" valueNumeric="0"/>
+      <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
+      <column name="PLACEHOLDER" value="adito_about"/>
+      <column name="ISREDIRECT" valueNumeric="1"/>
+      <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
+    </insert>
+    <insert tableName="weblink">
+      <column name="WEBLINKID" value="75b2ca5c-e270-45ad-9ade-7f70a15674b4"/>
+      <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+      <column name="USER_EDIT" value="Lisa Sommer"/>
+      <column name="URL" value="https://www.adito.de/impressum.html"/>
+      <column name="USER_NEW" value="Lisa Sommer"/>
+      <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
+      <column name="SCORE" valueNumeric="0"/>
+      <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
+      <column name="PLACEHOLDER" value="adito_impressum"/>
+      <column name="ISREDIRECT" valueNumeric="1"/>
+      <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
+    </insert>
+    <insert tableName="weblink">
+      <column name="WEBLINKID" value="ea7300fc-ee2d-49e6-8eb2-ff5b5922737a"/>
+      <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+      <column name="USER_EDIT" value="Lisa Sommer"/>
+      <column name="URL" value="https://www.adito.de/kontakt/formular.html"/>
+      <column name="USER_NEW" value="Lisa Sommer"/>
+      <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
+      <column name="SCORE" valueNumeric="0"/>
+      <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
+      <column name="PLACEHOLDER" value="adito_contact"/>
+      <column name="ISREDIRECT" valueNumeric="1"/>
+      <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
+    </insert>
  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
--- a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
@@ -16,6 +16,12 @@ var res = {
        "connectionField":"TASK_REQUESTOR_CONTACT_ID",
        "setGroupBy":"NameFor360"
    },
+    "Campaign": {        
+        "subContext":"CampaignParticipant",
+        "childField":"CAMPAIGN_ID",
+        "parentField":"CAMPAIGNID",
+        "contactIdField":"CONTACT_ID"
+    }, 
    "Advertising": {},
    "BulkMail": {        
        "subContext":"BulkMailRecipient",

--- a/entity/Activity_entity/entityfields/infotable/valueProcess.js
+++ b/entity/Activity_entity/entityfields/infotable/valueProcess.js
@@ -2,4 +2,9 @@ import("system.result");
 import("system.vars");
 import("system.text");

-result.string(text.html2text(vars.get("$field.INFO")));
\ No newline at end of file
+// Remove all linebreaks
+let info = vars.get("$field.INFO").replace(/\n/ig, "");
+// Remove all styles --> styles have no effect on the later text and they and these cause problems when converting
+info = info.replace(/style=\".*\"/ig, "");
+
+result.string(text.html2text(info));
--- a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
 import("Employee_lib");
-import("system.db");
 import("system.result");
 import("Sql_lib");
 import("KeywordRegistry_basic");
-                     
+
+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
+
 var opentask = newSelect("count(TASKID)")
    .from("TASK")
-    .where("TASK.STATUS", $KeywordRegistry.taskStatus$new())
-    .and ("TASK.KIND", "TASK")
-    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
-    .cell();
+    .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+    .where(
+        newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+        .or("TASKATTENDEES.DEPARTMENT_ID",departmentId)
+    )
+    .and("TASK.STATUS", $KeywordRegistry.taskStatus$new())
+    .cell();  
    
 result.string(opentask || 0);
\ No newline at end of file
--- a/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js
+++ b/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js
@@ -4,10 +4,17 @@ import("Sql_lib");
 import("Employee_lib");
 import("system.neon");

+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
+
 var taskIds = newSelect("TASKID")
    .from("TASK")
-    .where("TASK.STATUS", $KeywordRegistry.taskStatus$new())
-    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+    .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+    .where(
+        newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+        .or("TASKATTENDEES.DEPARTMENT_ID", departmentId)
+    )
+    .and("TASK.STATUS", $KeywordRegistry.taskStatus$new())
    .arrayColumn();

 var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist(taskIds).toString();

--- a/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js
+++ b/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js
 import("system.neonFilter");
 import("system.neon");
-import("system.db");
 import("ActivityTask_lib");
 import("Employee_lib");
 import("system.vars");
 import("Sql_lib");

+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
+
 var overdueTask = newSelect("TASKID")
                    .from("TASK")
-                    .where("TASK.MATURITY_DATE", "$sys.date", SqlBuilder.LESS())
-                    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+                    .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+                    .where(
+                        newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+                        .or("TASKATTENDEES.DEPARTMENT_ID",departmentId)
+                    )
+                    .and("TASK.MATURITY_DATE", "$sys.date", SqlBuilder.LESS())
                    .and("TASK.STATUS", TaskUtils.getEndedStatuses(), SqlBuilder.NOT_IN())
-                    .array(db.COLUMN)
+                    .arrayColumn();

 var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist(overdueTask).toString();
 neon.openContextWithRecipe("Task", "TaskFilter_view", recipe, neon.OPERATINGSTATE_SEARCH);