Merge branch 'cm_2002806_FalseWordingActionGroup' into '2021.2'

[Projekt: xRM-ContactManagement][TicketNr.: 2002806][360Degree: ActionGroup...

See merge request xrm/basic!1624

entity/360Degree_entity/360Degree_entity.aod

@@ -91,7 +91,7 @@
     </entityProvider>
     <entityActionGroup>
       <name>newModule</name>
-      <title>New module</title>
+      <title>Create new</title>
       <iconId>VAADIN:PLUS_CIRCLE</iconId>
       <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/stateProcess.js</stateProcess>
       <children>
@@ -116,17 +116,9 @@
           <iconId>VAADIN:FILE_TEXT</iconId>
           <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js</stateProcess>
         </entityActionField>
-        <entityActionField>
-          <name>newCampaignParticipant</name>
-          <title>Add to Campaign</title>
-          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js</onActionProcess>
-          <iconId>NEON:GROUP_APPOINTMENT</iconId>
-          <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js</stateProcess>
-          <tooltip>Choose a campaign and a step to add the contact to a  campaign</tooltip>
-        </entityActionField>
         <entityActionField>
           <name>newSupportticket</name>
-          <title>New Service ticket</title>
+          <title>Service ticket</title>
           <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsupportticket/onActionProcess.js</onActionProcess>
           <iconId>VAADIN:CHAT</iconId>
         </entityActionField>

entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js

-import("system.vars");
-import("Campaign_lib");
-
-if (vars.get("$param.BaseContextId_param") == "Person" || vars.get("$param.BaseContextId_param") == "Organisation")
-{
-    // Note: this only works if the BaseContextId_param is also the correct Tablename. If not you have to add a context - tablename mapping somewhere...
-    // for person / organisation this should work
-    CampaignUtils.addParticipantsByRowIds(JSON.stringify([JSON.parse(vars.get("$param.ObjectRowId_param"))[0]]), vars.get("$param.BaseContextId_param").toUpperCase());
-}
\ No newline at end of file

entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js

-import("system.vars");
-import("system.neon");
-import("system.result");
-
-var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
-if (contextList)
-{
-    var found = false;
-
-    for(context in contextList)
-    {
-        if(context == "Campaign")
-            found = true;        
-    }
-    if(found)
-        result.string(neon.COMPONENTSTATE_AUTO);
-    else
-        result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
-else
-{
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
\ No newline at end of file

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -9165,6 +9165,36 @@
     <entry>
       <key>Export structure</key>
     </entry>
+    <entry>
+      <key>Organisation: Language</key>
+    </entry>
+    <entry>
+      <key>No more than %0 records can be exported.</key>
+    </entry>
+    <entry>
+      <key>Salesproject: Created on</key>
+    </entry>
+    <entry>
+      <key>subordinate context</key>
+    </entry>
+    <entry>
+      <key>Salesproject: Type</key>
+    </entry>
+    <entry>
+      <key>Organisation: District</key>
+    </entry>
+    <entry>
+      <key>Organisation: Country</key>
+    </entry>
+    <entry>
+      <key>Organisation: Type</key>
+    </entry>
+    <entry>
+      <key>Organisation: Region</key>
+    </entry>
+    <entry>
+      <key>Organisation: City</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -12074,6 +12074,10 @@
       <key>No more than %0 records can be exported.</key>
       <value>Es können nur %0 Datensätze exportiert werden.</value>
     </entry>
+    <entry>
+      <key>Create new</key>
+      <value>Neuanlage</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -9243,6 +9243,36 @@
     <entry>
       <key>Export structure</key>
     </entry>
+    <entry>
+      <key>Organisation: Language</key>
+    </entry>
+    <entry>
+      <key>No more than %0 records can be exported.</key>
+    </entry>
+    <entry>
+      <key>Salesproject: Created on</key>
+    </entry>
+    <entry>
+      <key>subordinate context</key>
+    </entry>
+    <entry>
+      <key>Salesproject: Type</key>
+    </entry>
+    <entry>
+      <key>Organisation: District</key>
+    </entry>
+    <entry>
+      <key>Organisation: Country</key>
+    </entry>
+    <entry>
+      <key>Organisation: Type</key>
+    </entry>
+    <entry>
+      <key>Organisation: Region</key>
+    </entry>
+    <entry>
+      <key>Organisation: City</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>