From f5455b82bd5b30014f27d84e76729f83850b0bbd Mon Sep 17 00:00:00 2001
From: Vinzent Broens <v.broens@adito.de>
Date: Mon, 25 Oct 2021 13:22:56 +0000
Subject: [PATCH] Service 2001503 knowledge&offer
---
.../DocumentTemplateTicketCategory_entity.aod | 2 +-
.../DocumentTemplate_entity.aod | 2 +-
.../indexsearchknowledgebase/query.js | 2 +-
entity/Offer_entity/Offer_entity.aod | 2 +-
.../newsupportticket/onActionProcess.js | 2 +-
.../_____LANGUAGE_EXTRA.aod | 24 +++++++++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 29 ++++++++++---------
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 24 +++++++++++++++
.../DocumentTemplateTicketCategory.aod | 2 +-
9 files changed, 70 insertions(+), 19 deletions(-)
diff --git a/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod b/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod
index 688c012bbbd..fb3d1cdf657 100644
--- a/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod
+++ b/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod
@@ -44,7 +44,7 @@
</entityConsumer>
<entityProvider>
<name>DocumentTemplateClasificationsProv</name>
- <titlePlural>Serviceticket categories</titlePlural>
+ <titlePlural>Service ticket categories</titlePlural>
<children>
<entityParameter>
<name>DocumentTemplateId_param</name>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index c18b97ff740..a7ce89a91da 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -327,7 +327,7 @@
</entityConsumer>
<entityField>
<name>ALL_TICKET_CATEGORIES</name>
- <title>Use all serviceticket categories</title>
+ <title>Use all service ticket categories</title>
<contentType>BOOLEAN</contentType>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/all_ticket_categories/stateProcess.js</stateProcess>
diff --git a/entity/KnowledgeManagement_entity/recordcontainers/indexsearchknowledgebase/query.js b/entity/KnowledgeManagement_entity/recordcontainers/indexsearchknowledgebase/query.js
index 29d30e242c2..9255375feb2 100644
--- a/entity/KnowledgeManagement_entity/recordcontainers/indexsearchknowledgebase/query.js
+++ b/entity/KnowledgeManagement_entity/recordcontainers/indexsearchknowledgebase/query.js
@@ -24,7 +24,7 @@ var sql = newSelect([
]).from("KNOWLEDGEMANAGEMENT", "km1")
.leftJoin("KNOWLEDGETAGLINK", "KNOWLEDGEMANAGEMENTID = KNOWLEDGEMANAGEMENT_ID")
.leftJoin("KNOWLEDGETAG", "KNOWLEDGETAGID = KNOWLEDGETAG_ID")
- .orderBy("KNOWLEDGEMANAGEMENTID");
+ .orderBy("km1.KNOWLEDGEMANAGEMENTID");
if (vars.exists("$local.idvalue"))
querySelect.whereIfSet("KNOWLEDGEMANAGEMENT.KNOWLEDGEMANAGEMENTID", "$local.idvalue");
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 06cc973024a..cf13144de75 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 support 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/Offer_entity/entityfields/newsupportticket/onActionProcess.js b/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js
index 264784ddfb5..c71f9573320 100644
--- a/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("Ticket_lib");
-TicketUtils.openNewSupportticket( vars.get( "$field.OFFERID"), null, vars.get( "$field.CONTACT_ID"));
\ No newline at end of file
+TicketUtils.openNewSupportticket( vars.get( "$field.OFFERID"), null, null);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 54877615643..598cfd20b5f 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -11111,6 +11111,30 @@
<entry>
<key>Mailing to customer</key>
</entry>
+ <entry>
+ <key>Create only person</key>
+ </entry>
+ <entry>
+ <key>Slave administration '%0' is '%1'</key>
+ </entry>
+ <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>
+ <entry>
+ <key>Service ticket categories</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 517a6ab6078..07ddc7bfcd9 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -115,7 +115,7 @@
</entry>
<entry>
<key>Service ticket template</key>
- <value>Serviceticket-Vorlagen</value>
+ <value>Serviceticket-Vorlage</value>
</entry>
<entry>
<key>Service ticket</key>
@@ -129,7 +129,7 @@
<key>Template</key>
</entry>
<entry>
- <key>Use all serviceticket categories</key>
+ <key>Use all service ticket categories</key>
<value>Alle Serviceticket Kategorien verwenden</value>
</entry>
<entry>
@@ -361,7 +361,7 @@
<value>Keine Werbung</value>
</entry>
<entry>
- <key>Contact & Serviceticket</key>
+ <key>Contact & Service ticket</key>
<value>Kontakt & Serviceticket</value>
</entry>
<entry>
@@ -6525,7 +6525,7 @@
<value>E-Mail Vorlage</value>
</entry>
<entry>
- <key>New Service ticket</key>
+ <key>New service ticket</key>
<value>Neues Serviceticket</value>
</entry>
<entry>
@@ -13811,10 +13811,6 @@ Bitte Datumseingabe prüfen</value>
<key>Task maturity date</key>
<value>Prüfdatum</value>
</entry>
- <entry>
- <key>New service ticket</key>
- <value>Neues Serviceticket</value>
- </entry>
<entry>
<key>Support tickets</key>
<value>Supporttickets</value>
@@ -14169,12 +14165,12 @@ Bitte Datumseingabe prüfen</value>
<key>2</key>
</entry>
<entry>
- <key>Serviceticket category</key>
+ <key>Service ticket category</key>
<value>Serviceticket Kategorie</value>
</entry>
<entry>
- <key>Serviceticket categories</key>
- <value></value>
+ <key>Service ticket categories</key>
+ <value>Serviceticket Kategorien</value>
</entry>
<entry>
<key>Service tickets</key>
@@ -14182,6 +14178,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Service ticket templates</key>
+ <value>Serviceticket-Vorlagen</value>
</entry>
<entry>
<key>Status (Mailbridge)</key>
@@ -14525,10 +14522,16 @@ Bitte Datumseingabe prüfen</value>
<key>A Phase filter has to be set when creating a checklistentry for the Salesproject context.</key>
</entry>
<entry>
- <key>Open new mosaico template</key>
+ <key>New Service ticket</key>
</entry>
<entry>
- <key>Do you really want to resynchronize the user completely?\nThe data in ADITO will be deleted.\nThe outlook contacts must be cleared manually.</key>
+ <key>Serviceticket category</key>
+ </entry>
+ <entry>
+ <key>Serviceticket categories</key>
+ </entry>
+ <entry>
+ <key>Contact & Serviceticket</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 2eb9fd68501..3dd33ba156a 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -11207,6 +11207,30 @@
<entry>
<key>Mailing to customer</key>
</entry>
+ <entry>
+ <key>Create only person</key>
+ </entry>
+ <entry>
+ <key>Slave administration '%0' is '%1'</key>
+ </entry>
+ <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>
+ <entry>
+ <key>Service ticket categories</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod b/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod
index e998fb54350..2ca9bab7e65 100644
--- a/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod
+++ b/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
<name>DocumentTemplateTicketCategory</name>
- <title>Serviceticket category</title>
+ <title>Service ticket category</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entity>DocumentTemplateTicketCategory_entity</entity>
<references>
--
GitLab