Merge branch 'sales_pn_1081069_angebot_beleg_vertrag_anlegen_markedfordelete' into '2021.1'

[Projekt: xRM-Sales][TicketNr.: 1081069][Angebot/Beleg/Vertrag anlegen für...

See merge request xrm/basic!976

entity/AnyContact_entity/AnyContact_entity.aod

@@ -127,6 +127,10 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityParameter>
+      <name>IgnoreContactStates_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/AnyContact_entity/recordcontainers/db/conditionProcess.js

@@ -33,7 +33,15 @@ var cond = newWhereIfSet(conditionPrivateOrganisation)
                .andIfSet("CONTACT.ORGANISATION_ID", orgContactId);
 
 var contactIds = vars.exists("$param.ContactIds_param") && vars.get("$param.ContactIds_param");
-if (contactIds) 
+if (contactIds)
+{
     cond.andIfSet("CONTACT.CONTACTID", JSON.parse(contactIds), SqlBuilder.IN());
+}
+
+var ignoredContactStates = vars.exists("$param.IgnoreContactStates_param") && vars.get("$param.IgnoreContactStates_param");
+if (ignoredContactStates)
+{
+    cond.andIfSet("CONTACT.STATUS", JSON.parse(ignoredContactStates), SqlBuilder.NOT_IN());
+}
 
 result.string(cond.toString());
\ No newline at end of file

entity/Contract_entity/Contract_entity.aod

@@ -183,6 +183,12 @@
         <entityName>AnyContact_entity</entityName>
         <fieldName>#PROVIDER</fieldName>
       </dependency>
+      <children>
+        <entityParameter>
+          <name>IgnoreContactStates_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
     </entityConsumer>
     <entityProvider>
       <name>#PROVIDER</name>

entity/Contract_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js

+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string(JSON.stringify([
+    $KeywordRegistry.contactStatus$inactive(),
+    $KeywordRegistry.contactStatus$markToDelete()
+]));

entity/Offer_entity/Offer_entity.aod

@@ -237,6 +237,10 @@
           <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/anycontacts/children/contactids_param/valueProcess.js</valueProcess>
           <expose v="true" />
         </entityParameter>
+        <entityParameter>
+          <name>IgnoreContactStates_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>

entity/Offer_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js

+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string(JSON.stringify([
+    $KeywordRegistry.contactStatus$inactive(),
+    $KeywordRegistry.contactStatus$markToDelete()
+]));

entity/Order_entity/Order_entity.aod

@@ -182,6 +182,12 @@
         <entityName>AnyContact_entity</entityName>
         <fieldName>#PROVIDER</fieldName>
       </dependency>
+      <children>
+        <entityParameter>
+          <name>IgnoreContactStates_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
     </entityConsumer>
     <entityConsumer>
       <name>Documents</name>

entity/Order_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js

+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string(JSON.stringify([
+    $KeywordRegistry.contactStatus$inactive(),
+    $KeywordRegistry.contactStatus$markToDelete()
+]));