diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 138bbb2461cf453470c0b9017d0c3ce1e26920ae..d2d3785cd3449b4a23506c092dd8c51ad26c55a3 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5055,6 +5055,12 @@
<entry>
<key>Credit</key>
</entry>
+ <entry>
+ <key>Show tickets where I am editor</key>
+ </entry>
+ <entry>
+ <key>My tickets</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 bbe44b77a5144041828dc0ce9c87a9db75db3c96..27d0c0e54b884f7fc90c3a2e9160eb4b25512804 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6393,6 +6393,13 @@
<key>Credit</key>
<value>Gutschrift</value>
</entry>
+ <entry>
+ <key>Show tickets where I am editor</key>
+ </entry>
+ <entry>
+ <key>My tickets</key>
+ <value>Meine Tickets</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 d84e2d85d5dc94203623275fb899c135e0223007..b3febb8ba3848a8b69c6e743941476b31c1751aa 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5105,6 +5105,12 @@
<entry>
<key>Credit</key>
</entry>
+ <entry>
+ <key>Show tickets where I am editor</key>
+ </entry>
+ <entry>
+ <key>My tickets</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 0a38ead6e8f0e7794f7b710e255ca4b0be9c1ec1..5993b1e5ebad4b24f6be5ad3939ef58b8660a8aa 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -11,16 +11,13 @@
<fragment>Activity/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles />
<icon>VAADIN:HOURGLASS_END</icon>
<categories>
<neonDashletCategory>
<name>contactmanagement</name>
<title>Contactmanagement</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>activity</name>
- <title>Activity</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
<neonDashletConfiguration>
@@ -36,10 +33,6 @@
<name>contactmanagement</name>
<title>Contactmanagement</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>activity</name>
- <title>Activity</title>
- </neonDashletCategory>
</categories>
<parameters>
<neonDashletParameter>
diff --git a/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod b/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod
index 688e281e0299db8697f468211ef897ca9f3393fb..1b47fded0a98dbd6ea0871867b7fd7ed4c131f5d 100644
--- a/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod
+++ b/neonView/AppointmentCheckUp_view/AppointmentCheckUp_view.aod
@@ -7,6 +7,9 @@
<name>AppointmentCheckupDashletConfig</name>
<title>Appointment checkup</title>
<fragment>Appointment/full</fragment>
+ <storeRoles>
+ <element>INTERNAL_ADMINISTRATOR</element>
+ </storeRoles>
<icon>VAADIN:CALENDAR</icon>
<categories>
<neonDashletCategory>
diff --git a/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod b/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod
index 509b780078a9944e235d8b1720dd9fcde0c3a1bc..0a1bec97ea00298b474e77e332f6b61e06e393e2 100644
--- a/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod
+++ b/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod
@@ -10,6 +10,9 @@
<title>Linked Appointments</title>
<description>Shows linked appointments</description>
<fragment>Appointment/full</fragment>
+ <storeRoles>
+ <element>INTERNAL_ADMINISTRATOR</element>
+ </storeRoles>
<icon>VAADIN:CALENDAR</icon>
<categories>
<neonDashletCategory>
diff --git a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
index d9d2fb05939a6e40a84b2b31b35d3e269d9068b9..15599baa63fe6d27f1c9ba03fd588fc8542fdfa6 100644
--- a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
+++ b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
@@ -9,16 +9,15 @@
<description>Shows campaing costs graphically processed</description>
<fragment>Campaign/full</fragment>
<singleton v="true" />
+ <storeRoles>
+ <element>PROJECT_Marketing</element>
+ </storeRoles>
<icon>VAADIN:MONEY</icon>
<categories>
<neonDashletCategory>
<name>marketing</name>
<title>Marketing</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>campaignmanagement</name>
- <title>Campaign management</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
</dashletConfigurations>
diff --git a/neonView/CampaignFilter_view/CampaignFilter_view.aod b/neonView/CampaignFilter_view/CampaignFilter_view.aod
index 10ec1fbfe7d56ef510e8d2ad0730b11e0cbf1841..73542fcd0726a2b63f35ab9094e678e3e2001012 100644
--- a/neonView/CampaignFilter_view/CampaignFilter_view.aod
+++ b/neonView/CampaignFilter_view/CampaignFilter_view.aod
@@ -12,16 +12,15 @@
<description>Show my campaigns</description>
<fragment>Campaign/filter</fragment>
<singleton v="true" />
+ <storeRoles>
+ <element>PROJECT_Marketing</element>
+ </storeRoles>
<icon>NEON:GROUP_APPOINTMENT</icon>
<categories>
<neonDashletCategory>
<name>marketing</name>
<title>Marketing</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>campaignmanagement</name>
- <title>Campaign management</title>
- </neonDashletCategory>
</categories>
<parameters>
<neonDashletParameter>
@@ -36,16 +35,15 @@
<description>Shows all campaigns</description>
<fragment>Campaign/filter</fragment>
<singleton v="true" />
+ <storeRoles>
+ <element>PROJECT_Marketing</element>
+ </storeRoles>
<icon>NEON:GROUP_APPOINTMENT</icon>
<categories>
<neonDashletCategory>
<name>marketing</name>
<title>Marketing</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>campaignmanagement</name>
- <title>Campaign management</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
</dashletConfigurations>
diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod
index f8809576951a467c00e7825be45fbc407c8bc36f..5fc1ae1b6368b81f19158a7155392613b33067bd 100644
--- a/neonView/ContractFilter_view/ContractFilter_view.aod
+++ b/neonView/ContractFilter_view/ContractFilter_view.aod
@@ -11,16 +11,16 @@
<fragment>Contract/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles>
+ <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_OfficeStaff</element>
+ </storeRoles>
<icon>vaadin:form</icon>
<categories>
<neonDashletCategory>
<name>sales</name>
<title>Sales</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>contract</name>
- <title>Contract</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
</dashletConfigurations>
diff --git a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
index 3ff241f4d71f3a49858dce7fb0b14b03f1c63046..3811ff5c13a6e6161626f5e477f861c1b2275446 100644
--- a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
+++ b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod
@@ -17,10 +17,6 @@
<name>social</name>
<title>Social Media</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>facebook</name>
- <title>Facebook</title>
- </neonDashletCategory>
</categories>
<parameters>
<neonDashletParameter>
@@ -41,10 +37,6 @@
<name>social</name>
<title>Social Media</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>facebook</name>
- <title>Facebook</title>
- </neonDashletCategory>
</categories>
<parameters>
<neonDashletParameter>
diff --git a/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod b/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
index b1e060e24f903f0c7cc13acc7dfb94ea20f63374..0452933bd514536a90bb2cf1196c1b84b2ae5088 100644
--- a/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
+++ b/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
@@ -12,12 +12,8 @@
<icon>VAADIN:CLIPBOARD_CHECK</icon>
<categories>
<neonDashletCategory>
- <name>tasks</name>
- <title>Tasks</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>calendar</name>
- <title>Calendar</title>
+ <name>contactmanagement</name>
+ <title>Contactmanagement</title>
</neonDashletCategory>
</categories>
</neonDashletConfiguration>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index 73222a07c2c85e2ac82cd14482dd8654496c4cb3..d2dc31488ab731ef1c8fd31372ebe68109ed52af 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -11,35 +11,35 @@
<fragment>Offer/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles>
+ <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_OfficeStaff</element>
+ </storeRoles>
<icon>vaadin:cart</icon>
<categories>
<neonDashletCategory>
<name>sales</name>
<title>Sales</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>offer</name>
- <title>Offer</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
<neonDashletConfiguration>
<name>SendOffersDashlet</name>
<title>Sent offers</title>
<description>Show all sent offers</description>
- <fragment>Offer/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJTVEFUVVMiLCJvcGVyYXRvciI6IkVRVUFMIiwidmFsdWUiOiJWZXJzZW5kZXQiLCJrZXkiOiJPRkZFUlNUQVRTRU5UICAgICAgICAgICAgICAgICAgICAgICAiLCJjb250ZW50dHlwZSI6IlRFWFQifV19</fragment>
+ <fragment>Offer/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles>
+ <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_OfficeStaff</element>
+ </storeRoles>
<icon>vaadin:cart</icon>
<categories>
<neonDashletCategory>
<name>sales</name>
<title>Sales</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>offer</name>
- <title>Offer</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
</dashletConfigurations>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index 1c2cd1ed438c54cdd09e0925756274f3bca6c675..084490fa904af0fc90907daab0e137ab2b1294cf 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -11,16 +11,16 @@
<fragment>Order/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles>
+ <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_OfficeStaff</element>
+ </storeRoles>
<icon>VAADIN:FILE_TEXT_O</icon>
<categories>
<neonDashletCategory>
<name>sales</name>
<title>Sales</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>order</name>
- <title>Receipt</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
<neonDashletConfiguration>
@@ -30,16 +30,16 @@
<fragment>Order/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles>
+ <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_OfficeStaff</element>
+ </storeRoles>
<icon>VAADIN:FILE_TEXT_O</icon>
<categories>
<neonDashletCategory>
<name>sales</name>
<title>Sales</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>order</name>
- <title>Receipt</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
</dashletConfigurations>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 68f25862f2745179150af77398976599c2f9e9fe..59d2100e1a0539d4eccc0871eaa2796caa990604 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -9,7 +9,7 @@
<title>Companies</title>
<description>Show all companies</description>
<fragment>Organisation/filter</fragment>
- <singleton v="true" />
+ <singleton v="false" />
<requiresConfiguration v="false" />
<icon>vaadin:building</icon>
<categories>
@@ -17,10 +17,6 @@
<name>contactmanagement</name>
<title>Contactmanagement</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>org</name>
- <title>Company</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
</dashletConfigurations>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index 4bf6de755356ac2e0026746f797901e42eb2bf3e..e345254134bf203847d5a9df52c347fac169dc58 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -9,7 +9,7 @@
<title>Contacts</title>
<description>Show all contacts</description>
<fragment>Person/filter</fragment>
- <singleton v="true" />
+ <singleton v="false" />
<requiresConfiguration v="false" />
<icon>vaadin:users</icon>
<categories>
@@ -17,10 +17,6 @@
<name>contactmanagement</name>
<title>Contactmanagement</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>person</name>
- <title>Contact</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
</dashletConfigurations>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index 872dbd01f7f90b1a0c153b3cc967425c5b9647a3..255fe83adec4f2d6626873a18756793335819072 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -11,16 +11,16 @@
<fragment>Product/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles>
+ <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_OfficeStaff</element>
+ </storeRoles>
<icon>vaadin:hammer</icon>
<categories>
<neonDashletCategory>
<name>sales</name>
<title>Sales</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>product</name>
- <title>Product</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
</dashletConfigurations>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 964dfa8a660128becca63d07a0ecf027fff3e4c4..33e4c09107eb0bd61c46db0a8293448ae958a65d 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -11,16 +11,16 @@
<fragment>Salesproject/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles>
+ <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_OfficeStaff</element>
+ </storeRoles>
<icon>vaadin:filter</icon>
<categories>
<neonDashletCategory>
<name>sales</name>
<title>Sales</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
<neonDashletConfiguration>
@@ -30,16 +30,16 @@
<fragment>Salesproject/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJTVEFUVVMiLCJvcGVyYXRvciI6IkVRVUFMIiwidmFsdWUiOiJPZmZlbiIsImtleSI6IlNBTFBST0pTVEFUT1BFTiAgICAgICAgICAgICAgICAgICAgICIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9XX0%253D</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles>
+ <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_OfficeStaff</element>
+ </storeRoles>
<icon>vaadin:filter</icon>
<categories>
<neonDashletCategory>
<name>sales</name>
<title>Sales</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
</categories>
</neonDashletConfiguration>
</dashletConfigurations>
diff --git a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
index 6eba3c2afc9b288b28ba1d7813b259fe1ecce4de..5b8054824e1367b64a26cf4e7ba40a6e70ee71d6 100644
--- a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
+++ b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
@@ -9,15 +9,19 @@
<description>Shows how many sales projects are in the various sales phases</description>
<fragment>SalesprojectAnalyses/full</fragment>
<singleton v="true" />
+ <storeRoles>
+ <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_OfficeStaff</element>
+ </storeRoles>
<icon>VAADIN:FUNNEL</icon>
<categories>
<neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
+ <name>sales</name>
+ <title>Sales</title>
</neonDashletCategory>
<neonDashletCategory>
- <name>chart</name>
- <title>Chart</title>
+ <name>charts</name>
+ <title>Charts</title>
</neonDashletCategory>
</categories>
</neonDashletConfiguration>
diff --git a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
index bded03bc2d9c6983dd512a6ea7ca2d629a30e452..cd6b17fce709fc30c5dc61d006a16ebe5a953d76 100644
--- a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
+++ b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
@@ -9,11 +9,15 @@
<description>Most important salse key figures</description>
<fragment>SalesprojectAnalyses/full</fragment>
<singleton v="true" />
+ <storeRoles>
+ <element>PROJECT_FieldStaff</element>
+ <element>PROJECT_OfficeStaff</element>
+ </storeRoles>
<icon>VAADIN:GRID_BIG</icon>
<categories>
<neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
+ <name>sales</name>
+ <title>Sales</title>
</neonDashletCategory>
</categories>
</neonDashletConfiguration>
diff --git a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
index b1408c731b28e0ef4e79a12738dfe7736b43b1f7..86fe1316e540683d44392a855ae2f93e653196e7 100644
--- a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
+++ b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
@@ -6,16 +6,19 @@
<dashletConfigurations>
<neonDashletConfiguration>
<name>mytickets</name>
- <title>My tasks</title>
- <description>Show tasks where I am editor</description>
+ <title>My tickets</title>
+ <description>Show tickets where I am editor</description>
<fragment>Ticket/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles>
+ <element>PROJECT_Support</element>
+ </storeRoles>
<icon>VAADIN:TASKS</icon>
<categories>
<neonDashletCategory>
- <name>tickets</name>
- <title>Tickets</title>
+ <name>service</name>
+ <title>Service</title>
</neonDashletCategory>
</categories>
<parameters>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index cded3b0759b5b2df25149d5852b98a5034d39fd3..a4768f0cf33da6280e78b6658d95f541d35d6427 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -11,11 +11,12 @@
<fragment>Task/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
+ <storeRoles />
<icon>VAADIN:TASKS</icon>
<categories>
<neonDashletCategory>
- <name>tasks</name>
- <title>Tasks</title>
+ <name>contactmanagement</name>
+ <title>Contactmanagement</title>
</neonDashletCategory>
</categories>
<parameters>
diff --git a/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod b/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
index 7b850debc51fbb5188d6446d5cc634c307060eb7..99b2f2de4ce113248ade45a631a0cd194079d132 100644
--- a/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
+++ b/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
@@ -17,8 +17,8 @@
<icon>VAADIN:CHART</icon>
<categories>
<neonDashletCategory>
- <name>turnover</name>
- <title>Turnover</title>
+ <name>charts</name>
+ <title>Charts</title>
</neonDashletCategory>
</categories>
</neonDashletConfiguration>
diff --git a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
index 0af99bc565aed5d89a0d9b93568c25d386653b57..7c25691a4fd78a15de574d388b1a1f66edd91979 100644
--- a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
+++ b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod
@@ -17,10 +17,6 @@
<name>social</name>
<title>Social Media</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>twitter</name>
- <title>Twitter</title>
- </neonDashletCategory>
</categories>
<parameters>
<neonDashletParameter>
@@ -41,10 +37,6 @@
<name>social</name>
<title>Social Media</title>
</neonDashletCategory>
- <neonDashletCategory>
- <name>twitter</name>
- <title>Twitter</title>
- </neonDashletCategory>
</categories>
<parameters>
<neonDashletParameter>
diff --git a/neonView/UniversalFileProcessorDropzone_view/UniversalFileProcessorDropzone_view.aod b/neonView/UniversalFileProcessorDropzone_view/UniversalFileProcessorDropzone_view.aod
index 70fce04d5511956c50799407c8ff5fad3de03035..cdd230408eb699258567ee372e23d2f9c9ea9d30 100644
--- a/neonView/UniversalFileProcessorDropzone_view/UniversalFileProcessorDropzone_view.aod
+++ b/neonView/UniversalFileProcessorDropzone_view/UniversalFileProcessorDropzone_view.aod
@@ -13,8 +13,8 @@
<icon>VAADIN:UPLOAD</icon>
<categories>
<neonDashletCategory>
- <name>activity</name>
- <title>Activity</title>
+ <name>email</name>
+ <title>Email</title>
</neonDashletCategory>
</categories>
<parameters>
diff --git a/neonView/UnlinkedMailFilter_view/UnlinkedMailFilter_view.aod b/neonView/UnlinkedMailFilter_view/UnlinkedMailFilter_view.aod
index 8cbfe491f461265f0f5dfd8185c8a7d0b49b250a..e86c693f908f5b3dd645f2302e0d53a87b283e24 100644
--- a/neonView/UnlinkedMailFilter_view/UnlinkedMailFilter_view.aod
+++ b/neonView/UnlinkedMailFilter_view/UnlinkedMailFilter_view.aod
@@ -12,12 +12,8 @@
<icon>VAADIN:AT</icon>
<categories>
<neonDashletCategory>
- <name>contactmanagement</name>
- <title>Contactmanagement</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>activity</name>
- <title>Activity</title>
+ <name>email</name>
+ <title>Email</title>
</neonDashletCategory>
</categories>
</neonDashletConfiguration>