Merge branch...

Merge branch 'sales_pn_1078650_inactive_gebietsverantwortliche_sollen_nicht_angezeigt_werden' into '2021.1'

[Projekt: xRM-Sales][TicketNr.: 1078650][Project Member List- inaktive...

See merge request xrm/basic!974

entity/DistrictResponsible_entity/DistrictResponsible_entity.aod

@@ -229,6 +229,10 @@
       <name>DistrictResponsibleAdvisers</name>
       <lookupIdfield>EMPLOYEE_CONTACT_ID</lookupIdfield>
     </entityProvider>
+    <entityParameter>
+      <name>OnlyActive_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js

@@ -2,6 +2,7 @@ import("system.entities");
 import("system.result");
 import("system.vars");
 import("Sql_lib");
+import("KeywordRegistry_basic");
 
 var districtId = vars.get("$param.DistrictId_param");
 var orgUid = vars.get("$param.OrgUid_param");
@@ -22,4 +23,14 @@ else if(orgUid)
     }
 }
 
+if(vars.exists("$param.OnlyActive_param") && vars.get("$param.OnlyActive_param"))
+{
+    // not equal on null is undefined behavior
+    cond.and(newWhere(
+        "DISTRICTRESPONSIBLE.ADVISER_STATUS",
+        $KeywordRegistry.contactStatus$inactive(),
+        SqlBuilder.NOT_EQUAL()
+    ).or("DISTRICTRESPONSIBLE.ADVISER_STATUS is null"));
+}
+
 result.string(cond.toString());
\ No newline at end of file

entity/Member_entity/recordcontainers/jdito/contentProcess.js

@@ -75,6 +75,7 @@ if (Utils.isNullOrEmpty(idValues) || memberRows.length === 0)
             .entity("DistrictResponsible_entity")
             .provider("OrganisationResponsibles")
             .addParameter("OrgUid_param", orgContactId)
+            .addParameter("OnlyActive_param", true)
             .fields(["#UID","DISTRICTRESPONSIBLEID", "DISTRICT_ID", "EMPLOYEE_CONTACT_ID", 
                         "EMPLOYEE_CONTACT_ID.displayValue", "USER_EDIT", "USER_NEW", 
                         "departmentAttributeName", "DATE_EDIT", "DATE_NEW"]);

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -11220,6 +11220,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Buying center and internal project team</key>
+      <value>Vertriebscenter und internes Projektteam</value>
     </entry>
     <entry>
       <key>Starts the serverprocess manually, which will recalculate all (potentially) outdated classifications. Use this after changes to the configuration of classifications.</key>