From 40aa8a39b4a6ea00f7bd28d650b199d803d6c711 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 25 Jul 2019 09:47:18 +0200
Subject: [PATCH] fix contract
---
entity/Contract_entity/Contract_entity.aod | 1 +
.../Contract_entity/entityfields/contractend/onValueChange.js | 2 +-
entity/Contract_entity/onValidation.js | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index bfb6a9cbaa7..f0589770125 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -65,6 +65,7 @@
<name>CONTRACTTYPE</name>
<title>Type of contract</title>
<consumer>ContractTypes</consumer>
+ <mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
diff --git a/entity/Contract_entity/entityfields/contractend/onValueChange.js b/entity/Contract_entity/entityfields/contractend/onValueChange.js
index 290f3dbb283..1e3c85c6ef6 100644
--- a/entity/Contract_entity/entityfields/contractend/onValueChange.js
+++ b/entity/Contract_entity/entityfields/contractend/onValueChange.js
@@ -5,5 +5,5 @@ import("Entity_lib");
var cEnd = vars.get("local.value");
var cDue = vars.get("$field.CONTRACTDUE");
-if (cDue != "" && cDue > cEnd)
+if (cDue && cEnd && cDue > cEnd)
vars.set("$field.CONTRACTDUE", cEnd);
\ No newline at end of file
diff --git a/entity/Contract_entity/onValidation.js b/entity/Contract_entity/onValidation.js
index 679cbdf51a9..c562298d184 100644
--- a/entity/Contract_entity/onValidation.js
+++ b/entity/Contract_entity/onValidation.js
@@ -9,7 +9,7 @@ var endDate = vars.get("$field.CONTRACTEND");
var errorMessage = "";
-if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
+if (endDate && !DateUtils.validateBeginnBeforeEnd(startDate, endDate))
errorMessage = DateUtils.getValidationFailString();
// check Duedate
--
GitLab