Merge branch 'marketing_af_2001726_bulkmail' into '2021.2'

[Projekt: xRM-Marketing][TicketNr.: 2001726][Aktion "Open new mosaico...

See merge request xrm/basic!1454

entity/BulkMail_entity/entityfields/newmosaicotemplate/stateProcess.js

@@ -3,7 +3,7 @@ import("system.neon");
 import("system.result");
 
 
-if (vars.get("$field.MOSAICOTEMPLATE_ID" || vars.get("$field.DOCUMENTTEMPLATE_ID") || vars.get("$field.content")))
+if (vars.get("$field.MOSAICOTEMPLATE_ID") || vars.get("$field.DOCUMENTTEMPLATE_ID") || vars.get("$field.content"))
 {
     result.string( neon.COMPONENTSTATE_INVISIBLE);
 }        

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -174,7 +174,6 @@
     </entry>
     <entry>
       <key>Use all serviceticket categories</key>
-      <value>Alle Serviceticket Kategorien verwenden</value>
     </entry>
     <entry>
       <key>reopen Ticket</key>
@@ -8056,7 +8055,7 @@
       <value>%0/%1 verarbeitet:</value>
     </entry>
     <entry>
-      <key>Mosaico  template</key>
+      <key>Mosaico template</key>
       <value>Mosaicovorlage</value>
     </entry>
     <entry>
@@ -14586,6 +14585,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Open new mosaico template</key>
+      <value>In Mosaico erstellen</value>
     </entry>
     <entry>
       <key>Name has to be unique.</key>
@@ -14602,24 +14602,13 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>New Service ticket</key>
     </entry>
-    <entry>
-      <key>Serviceticket category</key>
-      <value>Serviceticket-Kategorie</value>
-    </entry>
     <entry>
       <key>Use all service ticket categories</key>
     </entry>
-    <entry>
-      <key>Contact &amp; Serviceticket</key>
-      <value>Kontakt &amp; Serviceticket</value>
-    </entry>
     <entry>
       <key>Service ticket categories</key>
       <value>Serviceticket-Kategorien</value>
     </entry>
-    <entry>
-      <key>Use all serviceticket categories</key>
-    </entry>
     <entry>
       <key>Manual resynchronization</key>
       <value>Manuelle Neusynchronisation</value>

neonView/BulkMailPreview_view/BulkMailPreview_view.aod

@@ -15,7 +15,6 @@
       <iconField>ICON</iconField>
       <titleField>NAME</titleField>
       <subtitleField>STATUS</subtitleField>
-      <descriptionField>DESCRIPTION</descriptionField>
       <favoriteAction1>sendMail</favoriteAction1>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
@@ -56,6 +55,10 @@
           <name>1a99fef8-775e-48e2-b40c-fbe9c9b0f725</name>
           <entityField>MOSAICOTEMPLATE_ID</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>65546b24-3f6d-4639-b144-491ff5c478c1</name>
+          <entityField>USE_TEMPLATE_ATTACHMENTS</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>514d0861-ad00-4d32-9c56-6be0443e03e3</name>
           <entityField>CREATEACTIVITIES</entityField>
@@ -65,20 +68,16 @@
           <entityField>DESCRIPTION</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>65546b24-3f6d-4639-b144-491ff5c478c1</name>
-          <entityField>USE_TEMPLATE_ATTACHMENTS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>8f811e5a-0477-4ba8-8f6e-fbb390833459</name>
-          <entityField>EMPLOYEE_CONTACT_ID</entityField>
+          <name>c1a6bec9-5c06-4755-9eee-19b5636c143d</name>
+          <entityField>ISOLANGUAGE</entityField>
         </entityFieldLink>
         <entityFieldLink>
           <name>9f3df668-6741-4faf-9afc-a0d761db990a</name>
           <entityField>INTEREST_ID</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>c1a6bec9-5c06-4755-9eee-19b5636c143d</name>
-          <entityField>ISOLANGUAGE</entityField>
+          <name>8f811e5a-0477-4ba8-8f6e-fbb390833459</name>
+          <entityField>EMPLOYEE_CONTACT_ID</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>