From 25ef981f9749e59dc8eeae42554e79c643ccecb7 Mon Sep 17 00:00:00 2001
From: Sascha Schmidt <s.schmidt@adito.de>
Date: Fri, 22 Oct 2021 12:34:46 +0200
Subject: [PATCH] [Projekt: xRM-ContactManagement][TicketNr.: 1068310][Export
 Kontakte fehlerhaft]

---
 .../entityfields/charset/dropDownProcess.js                 | 5 ++++-
 language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod        | 6 ++++++
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod              | 6 ++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/entity/ExportTemplateSelection_entity/entityfields/charset/dropDownProcess.js b/entity/ExportTemplateSelection_entity/entityfields/charset/dropDownProcess.js
index 3e47786c24e..cfcaa3d7810 100644
--- a/entity/ExportTemplateSelection_entity/entityfields/charset/dropDownProcess.js
+++ b/entity/ExportTemplateSelection_entity/entityfields/charset/dropDownProcess.js
@@ -1,3 +1,6 @@
 import("system.result");
 
-result.object([["UTF-8", "UTF-8"]]);
\ No newline at end of file
+result.object([
+    ["UTF-8", "UTF-8"],
+    ["ISO-8859-1", "ISO-8859-1"]
+]);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index ee4ee87895c..04bfd805d3d 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -11144,6 +11144,12 @@
     <entry>
       <key>Affected rows</key>
     </entry>
+    <entry>
+      <key>MM/dd/yyyy</key>
+    </entry>
+    <entry>
+      <key>dd/MM/yyyy</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 36a44220257..9dd67efee48 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -11240,6 +11240,12 @@
     <entry>
       <key>Affected rows</key>
     </entry>
+    <entry>
+      <key>MM/dd/yyyy</key>
+    </entry>
+    <entry>
+      <key>dd/MM/yyyy</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
-- 
GitLab