[Projekt: xRM-Sales][TicketNr.: 1079933][[Angebot] Status "Verloren",...

[Projekt: xRM-Sales][TicketNr.: 1079933][[Angebot] Status "Verloren", "Gewonnen" kann nicht gesetzt werden, wenn Status "Versendet" erreicht]

entity/KeywordEntry_entity/recordcontainers/jdito/contentProcess.js

@@ -20,6 +20,24 @@ var keywordStatement = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE
                 .from("AB_KEYWORD_ENTRY")
                 .join("AB_KEYWORD_CATEGORY", "AB_KEYWORD_ENTRY.AB_KEYWORD_CATEGORY_ID = AB_KEYWORD_CATEGORY.AB_KEYWORD_CATEGORYID")
                 .where();
+                
+var whitelist = JSON.parse(vars.get("$param.WhitelistIds_param"));
+var blacklist = JSON.parse(vars.get("$param.BlacklistIds_param"));
+if (whitelist)
+{
+    if (whitelist.length > 0)
+    {
+        keywordStatement.and("AB_KEYWORD_ENTRY.KEYID", whitelist, SqlBuilder.IN());
+    }
+    else
+    {
+        keywordStatement.noResult(); // force empty result if whitelist is empty
+    }
+}
+if (blacklist && blacklist.length > 0)
+{
+    keywordStatement.and("AB_KEYWORD_ENTRY.KEYID", blacklist, SqlBuilder.NOT_IN());
+}
             
 if (vars.get("$param.OnlyActives_param") == "true")
 {

entity/ObjectProxy_entity/ObjectProxy_entity.aod

@@ -156,8 +156,6 @@
       <name>DocumentTemplates</name>
       <dependency>
         <name>dependency</name>
-        <entityName>DocumentTemplate_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
     <entityConsumer>

entity/Offer_entity/Offer_entity.aod

@@ -328,6 +328,10 @@
           <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js</valueProcess>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>WhitelistIds_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/whitelistids_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>

entity/Offer_entity/entityfields/keywordofferstates/children/whitelistids_param/valueProcess.js

+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+
+if(vars.get("$field.STATUS") == $KeywordRegistry.offerStatus$sent())
+{
+    result.string(JSON.stringify([
+        $KeywordRegistry.offerStatus$sent(),
+        $KeywordRegistry.offerStatus$won(),
+        $KeywordRegistry.offerStatus$lost()
+    ]));
+}

entity/Offer_entity/grantUpdateProcess.js

@@ -7,8 +7,6 @@ import("KeywordRegistry_basic");
 // using the grant update would also disable the status field.
 
 var status = vars.get("$field.STATUS");
-var editable = status != $KeywordRegistry.offerStatus$sent()
-    && status != $KeywordRegistry.offerStatus$won()
-    && status != $KeywordRegistry.offerStatus$lost();
+var editable = status != $KeywordRegistry.offerStatus$won() && status != $KeywordRegistry.offerStatus$lost();
 
 result.string(editable || tools.hasRole(vars.get("$sys.user"), "INTERNAL_ADMINISTRATOR"));