From 7c43949c7189cc7d63c106a99881797abc964492 Mon Sep 17 00:00:00 2001 From: "p.neub" <p.neub@adito.de> Date: Tue, 23 Nov 2021 15:53:50 +0100 Subject: [PATCH] [Projekt: xRM-Sales][TicketNr.: 1086014][Vertriebsprojekt Projektstart- RollOut Validierungsmeldung anpassen] --- entity/Salesproject_entity/onValidation.js | 10 +++++++--- language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/entity/Salesproject_entity/onValidation.js b/entity/Salesproject_entity/onValidation.js index ffe29cce81..de922a24e2 100644 --- a/entity/Salesproject_entity/onValidation.js +++ b/entity/Salesproject_entity/onValidation.js @@ -6,7 +6,11 @@ import("system.vars"); var startDate = vars.get("$field.STARTDATE"); var endDate = vars.get("$field.ENDDATE"); -if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate)) - result.string(DateUtils.getValidationFailString()); +if(!DateUtils.validateBeginnBeforeEnd(startDate, endDate)) +{ + result.string(translate.text("The roll out date must be after the project start!")); +} else if(!vars.get("$field.PROJECTTITLE") && vars.get("$field.PROJECTTYPE") && vars.exists("$param.PresetTitle_param")) - result.string(translate.text("The Salesproject can only be filled when a company has been specified")); \ No newline at end of file +{ + result.string(translate.text("The Salesproject can only be filled when a company has been specified")); +} diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 85b7bf7f35..339dcfe72c 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -14691,6 +14691,10 @@ Bitte Datumseingabe prüfen</value> <key>Discount in %0</key> <value>Rabatt in %0</value> </entry> + <entry> + <key>The roll out date must be after the project start!</key> + <value>Das Roll Out Datum muss nach dem Projektstart liegen!</value> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> -- GitLab