diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod index 8bd374fd3485951d6ff0cef39ff55d465a66f135..a238832f1d236913854ff9ffa634281c3081d5ec 100644 --- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod +++ b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod @@ -90,9 +90,9 @@ <description></description> <children> <entityActionField> - <name>addNewUserPermissionDealerAction</name> - <title>Add new User Permission</title> - <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/addnewuserpermissiondealeraction/onActionProcess.js</onActionProcess> + <name>receiveNewUserPermissionDealerAction</name> + <title>Receive new User Permission</title> + <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/receivenewuserpermissiondealeraction/onActionProcess.js</onActionProcess> <isMenuAction v="true" /> <isObjectAction v="false" /> <isSelectionAction v="false" /> @@ -100,9 +100,9 @@ <tooltip></tooltip> </entityActionField> <entityActionField> - <name>addNewDepartmentPermissionDealterAction</name> - <title>Add new Department Permission</title> - <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/addnewdepartmentpermissiondealteraction/onActionProcess.js</onActionProcess> + <name>receiveNewDepartmentPermissionDealterAction</name> + <title>Receive new Department Permission</title> + <onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/receivenewdepartmentpermissiondealteraction/onActionProcess.js</onActionProcess> <isObjectAction v="false" /> <state>AUTO</state> </entityActionField> diff --git a/entity/PermissionCalendar_entity/entityfields/addactions/children/addnewdepartmentpermissiondealteraction/onActionProcess.js b/entity/PermissionCalendar_entity/entityfields/addactions/children/receivenewdepartmentpermissiondealteraction/onActionProcess.js similarity index 100% rename from entity/PermissionCalendar_entity/entityfields/addactions/children/addnewdepartmentpermissiondealteraction/onActionProcess.js rename to entity/PermissionCalendar_entity/entityfields/addactions/children/receivenewdepartmentpermissiondealteraction/onActionProcess.js diff --git a/entity/PermissionCalendar_entity/entityfields/addactions/children/addnewuserpermissiondealeraction/onActionProcess.js b/entity/PermissionCalendar_entity/entityfields/addactions/children/receivenewuserpermissiondealeraction/onActionProcess.js similarity index 100% rename from entity/PermissionCalendar_entity/entityfields/addactions/children/addnewuserpermissiondealeraction/onActionProcess.js rename to entity/PermissionCalendar_entity/entityfields/addactions/children/receivenewuserpermissiondealeraction/onActionProcess.js diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index f32d5f97f0963a35286bac0842e7f823d580201a..ed12fc0f39983f65d9e03fa38e9411b86427147a 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -6806,6 +6806,24 @@ <entry> <key>Settings</key> </entry> + <entry> + <key>workflow notification</key> + </entry> + <entry> + <key>Permission received</key> + </entry> + <entry> + <key>leadimport notification</key> + </entry> + <entry> + <key>granted permission</key> + </entry> + <entry> + <key>bulk mail sent</key> + </entry> + <entry> + <key>download ready</key> + </entry> <entry> <key>No new recipients found that can be added to the bulk mail.</key> </entry> @@ -6833,6 +6851,12 @@ <entry> <key>send mail</key> </entry> + <entry> + <key>Add new Department Permission</key> + </entry> + <entry> + <key>Add new User Permission</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 7d8ec08a7b60354c748b9a25bfb6c35dd7a7c297..a4c956a47885f4d1a8c17b2e4c016cc676c2df32 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -8187,7 +8187,6 @@ Bitte Datumseingabe prüfen</value> </entry> <entry> <key>Send email</key> - <value>E-Mail losschicken</value> </entry> <entry> <key>Activites</key> @@ -8735,40 +8734,68 @@ Bitte Datumseingabe prüfen</value> <value>gültig ab (in </value> </entry> <entry> - <key>No new recipients found that can be added to the bulk mail.</key> - <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value> + <key>workflow notification</key> </entry> <entry> - <key>Add Recipients</key> - <value>Empfänger hinzufügen</value> + <key>Permission received</key> + <value>erhaltene Berechtigung</value> </entry> <entry> - <key>Add Participants</key> - <value>Teilnehmer hinzufügen</value> + <key>leadimport notification</key> </entry> <entry> - <key>Download letter and create Activity</key> - <value>Brief herunterladen und Aktivität erstellen</value> + <key>granted permission</key> + <value>vergebene Berechtigung</value> </entry> <entry> - <key>and open Report</key> - <value>und Report öffnen</value> + <key>bulk mail sent</key> </entry> <entry> - <key>export</key> + <key>download ready</key> </entry> <entry> - <key>export using the selected template</key> - <value>Mit der ausgewählten Vorlage Exportieren</value> + <key>Receive new Department Permission</key> + <value>Neue Abteilungs-Berechtigung erhalten</value> + </entry> + <entry> + <key>Receive new User Permission</key> + <value>Neue Benutzer-Berechtigung erhalten</value> + </entry> + <entry> + <key>export</key> </entry> <entry> <key>No new recipients found that can be added to the serial letter.</key> <value>Keine neuen Empfänger, die zum Serienbrief werden können, gefunden.</value> </entry> + <entry> + <key>No new recipients found that can be added to the bulk mail.</key> + <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value> + </entry> + <entry> + <key>export using the selected template</key> + <value>Mit der ausgewählten Vorlage Exportieren</value> + </entry> <entry> <key>send mail</key> <value>E-Mail losschicken</value> </entry> + <entry> + <key>Download letter and create Activity</key> + <value>Brief herunterladen und Aktivität erstellen</value> + </entry> + <entry> + <key>Add Participants</key> + <value>Teilnehmer hinzufügen</value> + </entry> + <entry> + <key>and open Report</key> + <value>und Report öffnen</value> + </entry> + <entry> + <key>Add Recipients</key> + <value>Empfänger hinzufügen</value> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 40c367a50dbcf0c18340e45272f77ed124779931..f795919fd82d323b6293b5b6ada7effe00920d07 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -6872,6 +6872,24 @@ <entry> <key>Settings</key> </entry> + <entry> + <key>workflow notification</key> + </entry> + <entry> + <key>Permission received</key> + </entry> + <entry> + <key>leadimport notification</key> + </entry> + <entry> + <key>granted permission</key> + </entry> + <entry> + <key>bulk mail sent</key> + </entry> + <entry> + <key>download ready</key> + </entry> <entry> <key>No new recipients found that can be added to the bulk mail.</key> </entry> @@ -6899,6 +6917,12 @@ <entry> <key>send mail</key> </entry> + <entry> + <key>Receive new Department Permission</key> + </entry> + <entry> + <key>Receive new User Permission</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonView/PermissionCalendarFilterDrawer_view/PermissionCalendarFilterDrawer_view.aod b/neonView/PermissionCalendarFilterDrawer_view/PermissionCalendarFilterDrawer_view.aod index 32b319f4445dd4838b972b11db7c6193c7833b35..bea5b5d3b4c83c14236e3e3ee1164389370c87fd 100644 --- a/neonView/PermissionCalendarFilterDrawer_view/PermissionCalendarFilterDrawer_view.aod +++ b/neonView/PermissionCalendarFilterDrawer_view/PermissionCalendarFilterDrawer_view.aod @@ -5,7 +5,7 @@ <layout> <drawerLayout> <name>layout</name> - <layoutCaption>of other on this employee's calendar</layoutCaption> + <layoutCaption>Permission received</layoutCaption> <fixedDrawer v="true" /> </drawerLayout> </layout> diff --git a/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod b/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod index df480a219c345fe0847a2ebdf5c5f62479108e60..ae077ac28d6a0d93a8073361d0467f7abc3a6478 100644 --- a/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod +++ b/neonView/PermissionCalendarFilterReverse_view/PermissionCalendarFilterReverse_view.aod @@ -7,12 +7,14 @@ <layout> <drawerLayout> <name>layout</name> - <layoutCaption>of this employee on the calendar of others</layoutCaption> + <layoutCaption>granted permission</layoutCaption> + <fixedDrawer v="true" /> </drawerLayout> </layout> <children> <tableViewTemplate> <name>PermissionCalendarFilterReverseTable</name> + <favoriteActionGroup1>AddReverseAction</favoriteActionGroup1> <entityField>#ENTITY</entityField> <isCreatable v="false" /> <isDeletable v="false" />