From daa066a6ef4ef3c74c26c27450800510afde861b Mon Sep 17 00:00:00 2001
From: Vinzent Broens <v.broens@adito.de>
Date: Thu, 11 Nov 2021 14:45:28 +0100
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-Service][TicketNr.:=202001374][?=
=?UTF-8?q?=C3=9Cbersetzungen=20nachpflegen]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../children/objecttype_param/valueProcess.js | 3 +-
.../children/objecttype_param/valueProcess.js | 3 +-
.../recordcontainers/jdito/contentProcess.js | 5 -
entity/Activity_entity/Activity_entity.aod | 2 +-
.../checklist_context/displayValueProcess.js | 7 +-
.../EmployeeGroupContactRelation_entity.aod | 4 +-
entity/Offer_entity/Offer_entity.aod | 2 +-
.../QuickEntry_entity/QuickEntry_entity.aod | 2 +-
.../SupportTicketTemplate_entity.aod | 1 +
.../documenttemplate_id/titleProcess.js | 2 +-
.../individual_answer/titleProcess.js | 9 ++
.../SupportTicket_entity.aod | 11 +-
.../SupportTicket_entity/documentation.adoc | 2 +-
.../is_overdue_symbol/valueProcess.js | 2 +-
.../newticketcontact/onActionProcess.js | 2 +-
.../task_maturity_date/colorProcess.js | 3 +-
.../namefor360.value/expression.js | 3 +
.../_____LANGUAGE_EXTRA.aod | 61 ++++++-----
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 32 +++++-
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 63 +++++------
neonContext/Person/Person.aod | 2 +-
.../EmployeeGroupConRelMultiedit_view.aod | 2 +-
.../PersonEditSupportTicket_View.aod | 101 ++++++++++++++++++
.../QuickEntryEdit_view.aod | 2 +-
.../SupportTicketLookup_view.aod | 2 +-
process/ServiceEmail_lib/process.js | 14 +--
26 files changed, 247 insertions(+), 95 deletions(-)
create mode 100644 entity/SupportTicketTemplate_entity/entityfields/individual_answer/titleProcess.js
create mode 100644 entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/namefor360.value/expression.js
create mode 100644 neonView/PersonEditSupportTicket_View/PersonEditSupportTicket_View.aod
diff --git a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
index 42fd61cf278..cc537d09a0f 100644
--- a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
@@ -13,7 +13,8 @@ var res = {
},
"Contract": {},
"SupportTicket": {
- "connectionField":"TASK_REQUESTOR_CONTACT_ID"
+ "connectionField":"TASK_REQUESTOR_CONTACT_ID",
+ "setGroupBy":"NameFor360"
},
"Advertising": {},
"BulkMail": {
diff --git a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
index 738c1a7ab7f..5af71908346 100644
--- a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
@@ -15,7 +15,8 @@ var res = {
},
"Contract": {},
"SupportTicket": {
- "connectionField":"TASK_REQUESTOR_CONTACT_ID"
+ "connectionField":"TASK_REQUESTOR_CONTACT_ID",
+ "setGroupBy":"NameFor360"
},
"Campaign": {
"subContext":"CampaignParticipant",
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 69466b380b6..338cbed6497 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -2,7 +2,6 @@ import("KeywordRegistry_basic");
import("Sql_lib");
import("Contact_lib");
import("system.datetime");
-import("system.logging");
import("Util_lib");
import("system.translate");
import("system.result");
@@ -86,10 +85,7 @@ function _get360Data(pContactId, pContextList)
var description = row["#CONTENTDESCRIPTION"];
var dataDate = row["DATE_NEW"];
var active = row["ACTIVE"];
- if(pContextList[context].hasOwnProperty("setGroupBy"))
- group = row[pContextList[context]["setGroupBy"]]
-
if(pContextList[context].hasOwnProperty("setGroupBy"))
{
if( pContextList[context].hasOwnProperty("groupByKeyword") && groupKeyword)
@@ -97,7 +93,6 @@ function _get360Data(pContactId, pContextList)
else
group = row[pContextList[context]["setGroupBy"]]
}
-
if(context == "Salesproject")
{
if(!ContactUtils.isOrganisation(pContactId))//add roles to the description if person dataset
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index ef824839da6..a3c17c8064b 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -647,7 +647,7 @@
<entityField>
<name>infoNote</name>
<title>Description</title>
- <description>Necessary for small Editview for Serviceticket notes</description>
+ <description>Necessary for small Editview for Service ticket notes</description>
<contentType>LONG_TEXT</contentType>
<onValueChange>%aditoprj%/entity/Activity_entity/entityfields/infonote/onValueChange.js</onValueChange>
</entityField>
diff --git a/entity/Checklist_entity/entityfields/checklist_context/displayValueProcess.js b/entity/Checklist_entity/entityfields/checklist_context/displayValueProcess.js
index cc1b7432417..e4930f7400c 100644
--- a/entity/Checklist_entity/entityfields/checklist_context/displayValueProcess.js
+++ b/entity/Checklist_entity/entityfields/checklist_context/displayValueProcess.js
@@ -1,6 +1,11 @@
+import("system.project");
import("system.translate");
import("system.result");
import("system.vars");
import("Context_lib");
-result.string(translate.text(ContextUtils.getContextName(vars.get("$field.CHECKLIST_CONTEXT"))));
\ No newline at end of file
+if (vars.get("$field.CHECKLIST_CONTEXT") != "")
+{
+ var contextName = project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.CHECKLIST_CONTEXT"))[1];
+ result.string(translate.text(contextName));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod b/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
index 289e21e87ed..29bbc97d4b5 100644
--- a/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
+++ b/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
<name>EmployeeGroupContactRelation_entity</name>
- <title>Employee for Employee groups</title>
+ <title>Employee</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/EmployeeGroupContactRelation_entity/documentation.adoc</documentation>
<usePermissions v="false" />
- <titlePlural>Employees for Employee groups</titlePlural>
+ <titlePlural>Employees</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index cf13144de75..6d1230ed169 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1184,7 +1184,7 @@
</entityActionField>
<entityActionField>
<name>newSupportTicket</name>
- <title>New service ticket</title>
+ <title>New Service ticket</title>
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
<iconId>VAADIN:TICKET</iconId>
</entityActionField>
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index bcac4ae14de..0db66c9d524 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -233,7 +233,7 @@
<documentation>%aditoprj%/entity/QuickEntry_entity/entityfields/personcontactids_param/documentation.adoc</documentation>
</entityParameter>
<entityConsumer>
- <name>Servicetickets</name>
+ <name>Service tickets</name>
<dependency>
<name>dependency</name>
<entityName>SupportTicket_entity</entityName>
diff --git a/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod b/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
index d9f21fe1c5c..6a2f9580e38 100644
--- a/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
+++ b/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
@@ -232,6 +232,7 @@
<contentType>BOOLEAN</contentType>
<groupable v="true" />
<state>AUTO</state>
+ <titleProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/individual_answer/titleProcess.js</titleProcess>
</entityField>
<entityField>
<name>DOCUMENTTEMPLATE_ID</name>
diff --git a/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/titleProcess.js b/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/titleProcess.js
index 7a8fcf1c133..3b789ec22fe 100644
--- a/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/titleProcess.js
+++ b/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/titleProcess.js
@@ -7,5 +7,5 @@ import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
{
- result.string(translate.text("Indv Rempl Temp"))
+ result.string(translate.text("Indv Reply Tmpl"))
}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/individual_answer/titleProcess.js b/entity/SupportTicketTemplate_entity/entityfields/individual_answer/titleProcess.js
new file mode 100644
index 00000000000..857b761d40c
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/individual_answer/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+ result.string(translate.text("Indv. Answer"))
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 66eebc75bd7..32bb07459c6 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -770,7 +770,7 @@
<titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/new_ticketcontact/titleProcess.js</titleProcess>
</entityField>
<entityField>
- <name>isoverdue</name>
+ <name>IsOverDue</name>
<contentType>TEXT</contentType>
</entityField>
<entityField>
@@ -945,6 +945,9 @@
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>NameFor360</name>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1162,7 +1165,7 @@
<recordfield>TICKET.EMAIL_DESCRIPTION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>isoverdue.value</name>
+ <name>IsOverDue.value</name>
<expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/isoverdue.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
@@ -1178,6 +1181,10 @@
<name>DATE_NEW.value</name>
<recordfield>TASK.DATE_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NameFor360.value</name>
+ <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/namefor360.value/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/SupportTicket_entity/documentation.adoc b/entity/SupportTicket_entity/documentation.adoc
index e58f196c7e9..98cb9a38dca 100644
--- a/entity/SupportTicket_entity/documentation.adoc
+++ b/entity/SupportTicket_entity/documentation.adoc
@@ -1,5 +1,5 @@
= SupportTicket_entity
-Entity representing the ServiceTickets and the related process. Supportticket is called Serviceticket in all UI elements.
+Entity representing the Service Tickets and the related process. Supportticket is called Service ticket in all UI elements.
See context documentation for explanation how tickets work and how to add new TicketTypes.
diff --git a/entity/SupportTicket_entity/entityfields/is_overdue_symbol/valueProcess.js b/entity/SupportTicket_entity/entityfields/is_overdue_symbol/valueProcess.js
index 27f0af5d239..8aa84faafb8 100644
--- a/entity/SupportTicket_entity/entityfields/is_overdue_symbol/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/is_overdue_symbol/valueProcess.js
@@ -1,7 +1,7 @@
import("system.result");
import("system.vars");
-if (vars.get("$field.isoverdue"))
+if (vars.get("$field.IsOverDue"))
{
result.string("vaadin:warning");
}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newticketcontact/onActionProcess.js b/entity/SupportTicket_entity/entityfields/newticketcontact/onActionProcess.js
index d9b2c2b8384..0c09deee068 100644
--- a/entity/SupportTicket_entity/entityfields/newticketcontact/onActionProcess.js
+++ b/entity/SupportTicket_entity/entityfields/newticketcontact/onActionProcess.js
@@ -3,4 +3,4 @@ import("system.neon");
import("Ticket_lib")
var recipe = neonFilter.createEntityRecordsRecipeBuilder().toString();
-neon.openContextWithRecipe("Person", "PersonEditServiceTicket_view", recipe, neon.OPERATINGSTATE_NEW);
+neon.openContextWithRecipe("Person", "PersonEditSupportTicket_view", recipe, neon.OPERATINGSTATE_NEW);
diff --git a/entity/SupportTicket_entity/entityfields/task_maturity_date/colorProcess.js b/entity/SupportTicket_entity/entityfields/task_maturity_date/colorProcess.js
index 170610e2acc..7d9f0d45cc4 100644
--- a/entity/SupportTicket_entity/entityfields/task_maturity_date/colorProcess.js
+++ b/entity/SupportTicket_entity/entityfields/task_maturity_date/colorProcess.js
@@ -5,7 +5,7 @@ import("system.vars");
-var overdue =vars.get("$field.isoverdue");
+var overdue =vars.get("$field.IsOverDue");
if (!overdue)
{
@@ -16,4 +16,3 @@ else
result.string(neon.PRIORITY_HIGH_COLOR);
}
-
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/namefor360.value/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/namefor360.value/expression.js
new file mode 100644
index 00000000000..008385eb044
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/namefor360.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("'Service ticket'");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 5ef51dfa556..8a3d37f97e5 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -10027,15 +10027,6 @@
<entry>
<key>Re-open</key>
</entry>
- <entry>
- <key>Serviceticket category</key>
- </entry>
- <entry>
- <key>Use all serviceticket categories</key>
- </entry>
- <entry>
- <key>Serviceticket categories</key>
- </entry>
<entry>
<key>Query</key>
</entry>
@@ -10057,9 +10048,6 @@
<entry>
<key>Conclusion (Mailbridge)</key>
</entry>
- <entry>
- <key>Contact & Serviceticket</key>
- </entry>
<entry>
<key>Reply Mail</key>
</entry>
@@ -10213,9 +10201,6 @@
<entry>
<key>Serviceagent</key>
</entry>
- <entry>
- <key>Serviceticket</key>
- </entry>
<entry>
<key>ticket entry mailbridge</key>
</entry>
@@ -11120,12 +11105,18 @@
<entry>
<key>To re-opening tickets, please use the corresponding action.</key>
</entry>
+ <entry>
+ <key>Service ticket category</key>
+ </entry>
<entry>
<key>Create only person</key>
</entry>
<entry>
<key>Status change skipped!</key>
</entry>
+ <entry>
+ <key>Use all service ticket categories</key>
+ </entry>
<entry>
<key>Slave administration '%0' is '%1'</key>
</entry>
@@ -11139,46 +11130,49 @@
<key>Status changes skipped!</key>
</entry>
<entry>
- <key>Slave administration</key>
+ <key>Contact & Service ticket</key>
</entry>
<entry>
- <key>Service ticket category</key>
+ <key>Service ticket categories</key>
</entry>
<entry>
- <key>Use all service ticket categories</key>
+ <key>Handbook</key>
</entry>
<entry>
- <key>Contact & Service ticket</key>
+ <key>Reclamation</key>
</entry>
<entry>
- <key>Service ticket categories</key>
+ <key>Undefined</key>
</entry>
<entry>
- <key>Handbook</key>
+ <key>Indv. Answer</key>
</entry>
<entry>
- <key>Reclamation</key>
+ <key>Dflt. ticket temp.</key>
</entry>
<entry>
- <key>Undefined</key>
+ <key>Slave administration</key>
</entry>
<entry>
- <key>Mosaico template</key>
+ <key>Indv Rempl Temp</key>
</entry>
<entry>
- <key>${WEBLINK_SCORE}</key>
+ <key>Indv Remply Tmpl</key>
</entry>
<entry>
- <key>Create only person</key>
+ <key>Serviceticket</key>
</entry>
<entry>
- <key>Slave administration '%0' is '%1'</key>
+ <key>Serviceticket categories</key>
</entry>
<entry>
- <key>The file did not contain any data</key>
+ <key>Contact & Serviceticket</key>
</entry>
<entry>
- <key>Slave administration</key>
+ <key>Mosaico template</key>
+ </entry>
+ <entry>
+ <key>${WEBLINK_SCORE}</key>
</entry>
<entry>
<key>Fields of Dependency</key>
@@ -11207,6 +11201,15 @@
<entry>
<key>dd/MM/yyyy</key>
</entry>
+ <entry>
+ <key>Serviceticket category</key>
+ </entry>
+ <entry>
+ <key>Use all serviceticket categories</key>
+ </entry>
+ <entry>
+ <key>You have to add at least one recipient.</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 5851130b525..1c453c17817 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -93,6 +93,10 @@
<key>Do you really want to delete \"%0\"? If tickets still use this inbox, this might cause problems.</key>
<value>Postkorb \"%0\" wirklich löschen? Wenn noch Tickets mit diesem Postkorb existieren, kann das zu Problemen führen.</value>
</entry>
+ <entry>
+ <key>Indv. Answer</key>
+ <value>Indv. Antwort</value>
+ </entry>
<entry>
<key>Ticket duplicated (duplicate)</key>
<value>Ticket dupliziert (Duplikat)</value>
@@ -3433,6 +3437,7 @@
</entry>
<entry>
<key>Employee for Employee groups</key>
+ <value>Mitarbeiter für Mitarbeitergruppen</value>
</entry>
<entry>
<key>Office Properties</key>
@@ -5094,6 +5099,10 @@
<key>reports to</key>
<value>Berichtet an</value>
</entry>
+ <entry>
+ <key>Dflt. ticket temp.</key>
+ <value>Standardvorlage</value>
+ </entry>
<entry>
<key>subsidiary</key>
<value>Tochtergesellschaft</value>
@@ -6614,6 +6623,10 @@
<key>All Knowledge Entries</key>
<value>Alle Wissenseinträge</value>
</entry>
+ <entry>
+ <key>Indv Remply Tmpl</key>
+ <value>Indv. Vorlage</value>
+ </entry>
<entry>
<key>Maximal count must be one or higher</key>
<value>Maximale Anzahl muss eins oder höher sein</value>
@@ -14253,7 +14266,6 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Serviceticket categories</key>
- <value>Serviceticket-Kategorien</value>
</entry>
<entry>
<key>Service tickets</key>
@@ -14323,6 +14335,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Employess</key>
+ <value></value>
</entry>
<entry>
<key>Pull Ticket</key>
@@ -14334,9 +14347,6 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Serviceagent</key>
</entry>
- <entry>
- <key>Serviceticket</key>
- </entry>
<entry>
<key>ticket entry mailbridge</key>
</entry>
@@ -14519,6 +14529,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Employees for Employee groups</key>
+ <value>Mitarbeiter für Mitarbeitergruppen</value>
</entry>
<entry>
<key>Status changes skipped!</key>
@@ -14617,6 +14628,12 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Use all service ticket categories</key>
</entry>
+ <entry>
+ <key>Indv Rempl Temp</key>
+ </entry>
+ <entry>
+ <key>Serviceticket</key>
+ </entry>
<entry>
<key>Service ticket categories</key>
<value>Serviceticket-Kategorien</value>
@@ -14624,6 +14641,13 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Service ticket category</key>
</entry>
+ <entry>
+ <key>Contact & Service ticket</key>
+ <key>Service ticket category</key>
+ </entry>
+ <entry>
+ <key>Use all service ticket categories</key>
+ </entry>
<entry>
<key>Contact & Service ticket</key>
</entry>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 404b2541098..ae1160c8201 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -10041,9 +10041,6 @@
<entry>
<key>Enter new Ticket & Contact</key>
</entry>
- <entry>
- <key>Serviceticket category</key>
- </entry>
<entry>
<key>Back to report</key>
</entry>
@@ -10191,9 +10188,6 @@
<entry>
<key>Forward Ticket</key>
</entry>
- <entry>
- <key>Use all serviceticket categories</key>
- </entry>
<entry>
<key>Ticket resubmitted</key>
</entry>
@@ -10311,9 +10305,6 @@
<entry>
<key>inboxEmail</key>
</entry>
- <entry>
- <key>Serviceticket categories</key>
- </entry>
<entry>
<key>complaint</key>
</entry>
@@ -10569,9 +10560,6 @@
<entry>
<key>Price in</key>
</entry>
- <entry>
- <key>Contact & Serviceticket</key>
- </entry>
<entry>
<key>dupliacte Ticket</key>
</entry>
@@ -10788,9 +10776,6 @@
<entry>
<key>Serviceagent</key>
</entry>
- <entry>
- <key>Serviceticket</key>
- </entry>
<entry>
<key>ticket entry mailbridge</key>
</entry>
@@ -11207,6 +11192,9 @@
<entry>
<key>Mailing to customer</key>
</entry>
+ <entry>
+ <key>Service ticket category</key>
+ </entry>
<entry>
<key>Reclamation</key>
</entry>
@@ -11216,6 +11204,9 @@
<entry>
<key>Create only person</key>
</entry>
+ <entry>
+ <key>Use all service ticket categories</key>
+ </entry>
<entry>
<key>Handbook</key>
</entry>
@@ -11225,15 +11216,6 @@
<entry>
<key>The file did not contain any data</key>
</entry>
- <entry>
- <key>Slave administration</key>
- </entry>
- <entry>
- <key>Service ticket category</key>
- </entry>
- <entry>
- <key>Use all service ticket categories</key>
- </entry>
<entry>
<key>Contact & Service ticket</key>
</entry>
@@ -11259,22 +11241,25 @@
<key>Status changes skipped!</key>
</entry>
<entry>
- <key>Mosaico template</key>
+ <key>Indv. Answer</key>
</entry>
<entry>
- <key>${WEBLINK_SCORE}</key>
+ <key>Dflt. ticket temp.</key>
</entry>
<entry>
- <key>Create only person</key>
+ <key>Slave administration</key>
</entry>
<entry>
- <key>Slave administration '%0' is '%1'</key>
+ <key>Indv Rempl Temp</key>
</entry>
<entry>
- <key>The file did not contain any data</key>
+ <key>Indv Remply Tmpl</key>
</entry>
<entry>
- <key>Slave administration</key>
+ <key>Mosaico template</key>
+ </entry>
+ <entry>
+ <key>${WEBLINK_SCORE}</key>
</entry>
<entry>
<key>Fields of Dependency</key>
@@ -11303,6 +11288,24 @@
<entry>
<key>dd/MM/yyyy</key>
</entry>
+ <entry>
+ <key>Serviceticket category</key>
+ </entry>
+ <entry>
+ <key>Serviceticket</key>
+ </entry>
+ <entry>
+ <key>Use all serviceticket categories</key>
+ </entry>
+ <entry>
+ <key>Serviceticket categories</key>
+ </entry>
+ <entry>
+ <key>You have to add at least one recipient.</key>
+ </entry>
+ <entry>
+ <key>Contact & Serviceticket</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod
index 89a7339350b..56284adde99 100644
--- a/neonContext/Person/Person.aod
+++ b/neonContext/Person/Person.aod
@@ -73,7 +73,7 @@
</neonViewReference>
<neonViewReference>
<name>f69538b6-2565-4dc9-a418-f5a35af4fec8</name>
- <view>PersonEditServiceTicket_View</view>
+ <view>PersonEditSupportTicket_View</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonView/EmployeeGroupConRelMultiedit_view/EmployeeGroupConRelMultiedit_view.aod b/neonView/EmployeeGroupConRelMultiedit_view/EmployeeGroupConRelMultiedit_view.aod
index d7b9bfbc75b..4aa561b24e8 100644
--- a/neonView/EmployeeGroupConRelMultiedit_view/EmployeeGroupConRelMultiedit_view.aod
+++ b/neonView/EmployeeGroupConRelMultiedit_view/EmployeeGroupConRelMultiedit_view.aod
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
<name>EmployeeGroupConRelMultiedit_view</name>
- <title>Employess</title>
+ <title>Employees</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/PersonEditSupportTicket_View/PersonEditSupportTicket_View.aod b/neonView/PersonEditSupportTicket_View/PersonEditSupportTicket_View.aod
new file mode 100644
index 00000000000..34e32d3850f
--- /dev/null
+++ b/neonView/PersonEditSupportTicket_View/PersonEditSupportTicket_View.aod
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>PersonEditServiceTicket_View</name>
+ <title>Contact & Serviceticket</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:TICKET</icon>
+ <quickEntry v="9" />
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>a6b55bfc-7b0c-4020-a78d-18ee9a1d2b26</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>929f4179-21b1-4246-a3f7-9fd8a1994592</name>
+ <entityField>DuplicatesPerson</entityField>
+ <view>DuplicateEdit_view</view>
+ </neonViewReference>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <showDrawer v="false" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>d8d04e36-de46-48a3-994a-fa72d1f2ea89</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7a647c90-3a1c-4f8d-9ecd-6bdf35ab2f80</name>
+ <entityField>ORGANISATION_CONTACTID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8f7b95e8-e15e-4d9b-960a-ecd142c71c9e</name>
+ <entityField>SALUTATION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>413db0e9-00e8-4fd0-9bdc-8100509e622f</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ac32ab06-5b8f-460d-b136-384e879dd5c1</name>
+ <entityField>FIRSTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7222d731-80e0-4ef1-9761-e31dce4ed782</name>
+ <entityField>MIDDLENAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a5ad1cc7-8e97-4828-8eaa-02d0876af35b</name>
+ <entityField>LASTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>35861eb9-59c3-4317-8164-ee7c53ce397e</name>
+ <entityField>GENDER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>74de507e-75e0-4957-a4fb-7070fa3c5a4a</name>
+ <entityField>DATEOFBIRTH</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f8ec0e41-7ead-4c80-878c-df75ce5fce34</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>16b3b029-eed3-45b7-94b0-446c89d70594</name>
+ <entityField>DEPARTMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>720ba110-faa2-4c64-823b-82a2089f337c</name>
+ <entityField>CONTACTROLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7bad6e30-fda3-4ee4-858c-712a60437397</name>
+ <entityField>POSITION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>78dcb8dc-61c3-4cf9-a37b-28dbeeb27001</name>
+ <entityField>PersAddresses</entityField>
+ <view>AdressMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>fc64789f-b4c6-401e-86e3-f484451c7689</name>
+ <entityField>Communications</entityField>
+ <view>CommunicationMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>520f3056-2a24-4469-a86f-76ba80090829</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>dff4c15b-27f6-4c54-921a-d7bb8498a08f</name>
+ <entityField>Servicetickets</entityField>
+ <view>SupportTicketMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
index 6021037418a..d1aa285fbcd 100644
--- a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
+++ b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
@@ -80,7 +80,7 @@
</neonViewReference>
<neonViewReference>
<name>ad2e41fc-e1e3-4907-9d23-7f3e3c4a026b</name>
- <entityField>Servicetickets</entityField>
+ <entityField>Service tickets</entityField>
<view>SupportTicketMultiEdit_view</view>
</neonViewReference>
</children>
diff --git a/neonView/SupportTicketLookup_view/SupportTicketLookup_view.aod b/neonView/SupportTicketLookup_view/SupportTicketLookup_view.aod
index 0c12dfb690b..d6918be6833 100644
--- a/neonView/SupportTicketLookup_view/SupportTicketLookup_view.aod
+++ b/neonView/SupportTicketLookup_view/SupportTicketLookup_view.aod
@@ -9,7 +9,7 @@
</layout>
<children>
<tableViewTemplate>
- <name>Servicetickets</name>
+ <name>Service tickets</name>
<columns>
<neonTableColumn>
<name>8da3838a-a80a-4eca-9d34-01934ee31305</name>
diff --git a/process/ServiceEmail_lib/process.js b/process/ServiceEmail_lib/process.js
index b95659af157..1af163860ab 100644
--- a/process/ServiceEmail_lib/process.js
+++ b/process/ServiceEmail_lib/process.js
@@ -34,9 +34,9 @@ ServiceMailUtils.headerTextHistory = function ()
* @param {String} pTo the receiver address
* @param {String} pSender the mail address of the orginal sender
* @param {String} pSubject the subject of the original massage
- * @param {String} pTicketCode the code of the serviceticket
- * @param {String} pTicketID the ticketID of the serviceticket. As an optional method to get the TaskID
- * @param {String} pTaskID the taskID of the serviceticket
+ * @param {String} pTicketCode the code of the service ticket
+ * @param {String} pTicketID the ticketID of the service ticket. As an optional method to get the TaskID
+ * @param {String} pTaskID the taskID of the service ticket
*
* @return string with the original message, send date and time
*/
@@ -100,7 +100,7 @@ ServiceMailUtils.getBodyHistory = function(pTo,pSender,pSubject,pTicketCode,pTic
* @description Gets the original email message by the customer via a specific activityID
*
* @param {String} pActivityID the activityID of the activity
- * @param {String} pTicketID the ticketID of the serviceticket.
+ * @param {String} pTicketID the ticketID of the service ticket.
* @param {String} pKind the subject of the original massage
* @param {String} pTo the receiver address
* @param {String} pSender the mail address of the orginal sender
@@ -194,13 +194,13 @@ ServiceMailUtils.getBodyHistoryFromActivity = function(pActivityID, pTicketID, p
/**
* @description Gets the original email message by the customer viaactivities
*
- * @param {String} pTicketID the ticketID of the serviceticket.
- * @param {String} pTaskID the taskID of the serviceticket.
+ * @param {String} pTicketID the ticketID of the service ticket.
+ * @param {String} pTaskID the taskID of the service ticket.
* @param {String} pKind the subject of the original massage
* @param {String} pTo the receiver address
* @param {String} pSender the mail address of the orginal sender
* @param {String} pSubject the subject of the original massage
- * @param {String} pTicketCode the ticketcode of the serviceticket
+ * @param {String} pTicketCode the ticketcode of the service ticket
*
* @return string with the original message, send date and time
*/
--
GitLab