diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 7b430aeb512b9a7b197ec691e6d16631ed77281f..fd8c2fdd479fbe6d13bb34cc386a5e9b794e6cbd 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -453,6 +453,12 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newSupportticket</name>
+ <title>New Supportticket</title>
+ <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:QUESTION</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Activity_entity/entityfields/newsupportticket/onActionProcess.js b/entity/Activity_entity/entityfields/newsupportticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6bcfaddd9b44df49ff440fca43cfec2d19cd5958
--- /dev/null
+++ b/entity/Activity_entity/entityfields/newsupportticket/onActionProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+import("Ticket_lib")
+
+TicketUtils.createNewTicket(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.ACTIVITYID"))
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index ca90d0c707c56485d903e13ee59fea08eb8f0720..c70b106a92077b5fb48505b20418251d75e6decb 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -357,6 +357,12 @@
<name>ParentId_param</name>
<expose v="true" />
</entityParameter>
+ <entityActionField>
+ <name>newSupportticket</name>
+ <title>New Supportticket</title>
+ <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:QUESTION</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js b/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js
index 6ea79fab314f7066d0545749162afd47e44b379f..eef55adcac837abb1557202539e0fabc2c0ae815 100644
--- a/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("ActivityTask_lib");
import("Context_lib");
-ActivityUtils.createNewActivity(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.TASK_ID"));
\ No newline at end of file
+ActivityUtils.createNewActivity(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.TICKETID"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newsupportticket/onActionProcess.js b/entity/SupportTicket_entity/entityfields/newsupportticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b4a52cb145e6a84b79dfb72ba4ef97e2f981efce
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/newsupportticket/onActionProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+import("Ticket_lib")
+
+TicketUtils.createNewTicket(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.TICKETID"))
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 4d0e56d7104dcd7a202c79fda36f31f3009e0295..e0e7bc5655d40b3904d6d9fe82eb89db1afa268b 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -418,7 +418,7 @@
</entityField>
<entityActionField>
<name>newSupportticket</name>
- <title>Neues Supportticket</title>
+ <title>New Supportticket</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
<iconId>VAADIN:QUESTION</iconId>
</entityActionField>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index c409a2a6cf7af1abd9769a13437fdc7f16c19ac4..de9418c7ea47e0b6f43d3bc1120f00642cc2a0f0 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4464,6 +4464,99 @@
<entry>
<key>User Administration</key>
</entry>
+ <entry>
+ <key>Support Ticket</key>
+ </entry>
+ <entry>
+ <key>CC</key>
+ </entry>
+ <entry>
+ <key>Remarks</key>
+ </entry>
+ <entry>
+ <key>Xing</key>
+ </entry>
+ <entry>
+ <key>Organisation</key>
+ </entry>
+ <entry>
+ <key>Km</key>
+ </entry>
+ <entry>
+ <key>Billed</key>
+ </entry>
+ <entry>
+ <key>Km Fee</key>
+ </entry>
+ <entry>
+ <key>Credit Card</key>
+ </entry>
+ <entry>
+ <key>Taxi</key>
+ </entry>
+ <entry>
+ <key>Overnight stay</key>
+ </entry>
+ <entry>
+ <key>LinkedIn</key>
+ </entry>
+ <entry>
+ <key>In creation</key>
+ </entry>
+ <entry>
+ <key>Rented car</key>
+ </entry>
+ <entry>
+ <key>Update</key>
+ </entry>
+ <entry>
+ <key>The contact has an advertising ban for emails!</key>
+ </entry>
+ <entry>
+ <key>Blog</key>
+ </entry>
+ <entry>
+ <key>Until</key>
+ </entry>
+ <entry>
+ <key>From</key>
+ </entry>
+ <entry>
+ <key>Park fees</key>
+ </entry>
+ <entry>
+ <key>Abscences</key>
+ </entry>
+ <entry>
+ <key>Expense Report</key>
+ </entry>
+ <entry>
+ <key>Special displays</key>
+ </entry>
+ <entry>
+ <key>Transport cost</key>
+ </entry>
+ <entry>
+ <key>Day Fee</key>
+ </entry>
+ <entry>
+ <key>Fuel</key>
+ </entry>
+ <entry>
+ <key>Month</key>
+ </entry>
+ <entry>
+ <key>Working material</key>
+ </entry>
+ <entry>
+ <key>Hospitality</key>
+ </entry>
+ <entry>
+ <key>Trip purpose</key>
+ </entry>
+ <entry>
+ <key>Bed and Breakfast</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/neonContext/SupportTicket/SupportTicket.aod b/neonContext/SupportTicket/SupportTicket.aod
index fb9473deb5c21fd15bffcc129018e86d46867cdf..feb7436edc5f4781d26b169918d4e1732e6807f2 100644
--- a/neonContext/SupportTicket/SupportTicket.aod
+++ b/neonContext/SupportTicket/SupportTicket.aod
@@ -3,7 +3,6 @@
<name>SupportTicket</name>
<title>Support Ticket</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:QUESTION</icon>
<mainview>SupportTicketMain_view</mainview>
<filterview>SupportTicketFilter_view</filterview>
<editview>SupportTicketEdit_view</editview>
diff --git a/neonView/SupportTicketMain_view/SupportTicketMain_view.aod b/neonView/SupportTicketMain_view/SupportTicketMain_view.aod
index e2129c858ded8dca9a08acc084486bcd7cf5d5e0..1628c81ae4b6e56cfad711019fe5609bff3b449b 100644
--- a/neonView/SupportTicketMain_view/SupportTicketMain_view.aod
+++ b/neonView/SupportTicketMain_view/SupportTicketMain_view.aod
@@ -24,6 +24,11 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>e3dbf148-8d3d-4a62-ac20-17c878c0a669</name>
+ <entityField>ModuleTrees</entityField>
+ <view>ModuleTree_view</view>
+ </neonViewReference>
<neonViewReference>
<name>6846f680-84ef-46da-a0ea-6797044cf693</name>
<entityField>Documents</entityField>
@@ -44,10 +49,5 @@
<entityField>Attributes</entityField>
<view>AttributeRelationTree_view</view>
</neonViewReference>
- <neonViewReference>
- <name>e3dbf148-8d3d-4a62-ac20-17c878c0a669</name>
- <entityField>ModuleTrees</entityField>
- <view>ModuleTree_view</view>
- </neonViewReference>
</children>
</neonView>