From 2ff9769cac3e4d433acd8abf1d1a540588fe0fd5 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Fri, 31 Jul 2020 10:38:04 +0200
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.:
1060915][Schnelleingabe - nur kontaktperson in Schnelleingabe erfasst -
Erfassung Vertriebsprojekt ist aktiv]
---
entity/Salesproject_entity/onValidation.js | 5 ++++-
.../_____LANGUAGE_EXTRA.aod | 9 ++++++---
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 18 ++++++------------
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 9 +++++++++
4 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/entity/Salesproject_entity/onValidation.js b/entity/Salesproject_entity/onValidation.js
index e0b1e589a7..c961879681 100644
--- a/entity/Salesproject_entity/onValidation.js
+++ b/entity/Salesproject_entity/onValidation.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.result");
import("Date_lib");
import("system.vars");
@@ -6,4 +7,6 @@ var startDate = vars.get("$field.STARTDATE");
var endDate = vars.get("$field.ENDDATE");
if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
- result.string(DateUtils.getValidationFailString());
\ No newline at end of file
+ result.string(DateUtils.getValidationFailString());
+else if(!vars.get("$field.PROJECTTITLE") && vars.get("$field.PROJECTTYPE") && vars.exists("$param.PresetTitle_param"))
+ result.string(translate.text("The Sales Project can only be filled when a company has been specified"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 42409fc7a7..d339195f21 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6867,10 +6867,13 @@
<key>download ready</key>
</entry>
<entry>
- <key>Add new Department Permission</key>
+ <key>Total in euros</key>
</entry>
- <entry>
- <key>Add new User Permission</key>
+ <entry>
+ <key>Workflow Model</key>
+ </entry>
+ <entry>
+ <key>The Sales Project can only be filled when a company has been specified</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 04af5e1dd1..f62aa2329c 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8265,6 +8265,10 @@ Bitte Datumseingabe prüfen</value>
<key>Contactreport</key>
<value>Kontaktbericht</value>
</entry>
+ <entry>
+ <key>The Sales Project can only be filled when a company has been specified</key>
+ <value>Das Vertriebsprojekt kann nur ausgefüllt werden, wenn eine Firma angegeben ist</value>
+ </entry>
<entry>
<key>Appointment planned</key>
<value>Termin vereinbart</value>
@@ -8795,20 +8799,10 @@ Bitte Datumseingabe prüfen</value>
<key>download ready</key>
</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>
+ <key>Total in euros</key>
</entry>
<entry>
- <key>Add Recipients</key>
- <value>Empfänger hinzufügen</value>
+ <key>Workflow Model</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 831943f96a..dd32b2a7b3 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6932,6 +6932,15 @@
<entry>
<key>download ready</key>
</entry>
+ <entry>
+ <key>Total in euros</key>
+ </entry>
+ <entry>
+ <key>Workflow Model</key>
+ </entry>
+ <entry>
+ <key>The Sales Project can only be filled when a company has been specified</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab