From 8f83230fbc1acfba7548db1254a76929ce501dbf Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 2 Aug 2019 11:47:10 +0200
Subject: [PATCH] Minor fixes
---
.../LetterRecipient_entity.aod | 3 +++
.../entityfields/icon/colorProcess.js | 2 +-
.../_____LANGUAGE_EXTRA.aod | 3 +++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 20 +++++++++++++++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
5 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/entity/LetterRecipient_entity/LetterRecipient_entity.aod b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
index 44686814d8..53f48de51f 100644
--- a/entity/LetterRecipient_entity/LetterRecipient_entity.aod
+++ b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
@@ -2,6 +2,9 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>LetterRecipient_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <siblings>
+ <element>Address_entity</element>
+ </siblings>
<titlePlural>Recipients</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
diff --git a/entity/LetterRecipient_entity/entityfields/icon/colorProcess.js b/entity/LetterRecipient_entity/entityfields/icon/colorProcess.js
index 7c74f6cb35..2284141675 100644
--- a/entity/LetterRecipient_entity/entityfields/icon/colorProcess.js
+++ b/entity/LetterRecipient_entity/entityfields/icon/colorProcess.js
@@ -2,5 +2,5 @@ import("system.vars");
import("system.result");
import("system.neon");
-if (vars.get("$field.HASCOMMRESTRICTION") == "true")
+if (vars.get("$field.HASCOMMRESTRICTION") == "true" || !vars.get("$field.ADDRESS_ID.displayValue").trim())
result.string(neon.PRIORITY_HIGH_COLOR);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 9ec915acd0..8da5b48d48 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4872,6 +4872,9 @@
<entry>
<key>Test email</key>
</entry>
+ <entry>
+ <key>Recipient status</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 541e271bab..622063e4da 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -18,6 +18,14 @@
<key>Data Privacy</key>
<value>Datenschutz</value>
</entry>
+ <entry>
+ <key>No letters</key>
+ <value>Keine Briefe</value>
+ </entry>
+ <entry>
+ <key>No SMS</key>
+ <value>Keine SMS</value>
+ </entry>
<entry>
<key>Add the selection to a bulk mail</key>
<value>Fügt die Auswahl einer Serienmail hinzu</value>
@@ -42,6 +50,10 @@
<key>No data has been anonymized.</key>
<value>Keine Daten wurden anonymisiert.</value>
</entry>
+ <entry>
+ <key>No fax</key>
+ <value>Kein Fax</value>
+ </entry>
<entry>
<key>Excreted can't be in the future</key>
<value>Ausgeschieden darf nicht in der Zukunft liegen</value>
@@ -66,10 +78,18 @@
<key>MAX</key>
<value>maximal</value>
</entry>
+ <entry>
+ <key>No mails</key>
+ <value>Keine E-Mails</value>
+ </entry>
<entry>
<key>Create activities</key>
<value>Aktivitäten erstellen</value>
</entry>
+ <entry>
+ <key>No calls</key>
+ <value>Keine Anrufe</value>
+ </entry>
<entry>
<key>NONE</key>
<value>keine</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 27d3974f75..cc9a241b60 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -4921,6 +4921,9 @@
<entry>
<key>Test email</key>
</entry>
+ <entry>
+ <key>Recipient status</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab