From 4139f898c650ceb32136817cd2877e16266746af Mon Sep 17 00:00:00 2001
From: Sebastian Pongratz <s.pongratz@adito.de>
Date: Tue, 31 Aug 2021 11:02:34 +0000
Subject: [PATCH] [Projekt: xRM-ContactManagement][TicketNr.:
 1085592][Validierung der Postleitzahl funktioniert nicht mehr; fehlerhafte
 Darstellung bei japanischen Adressen]

---
 .../Data_alias/basic/2021.1.3/UpdateAddrFormats.xml      | 9 +++++++++
 .liquibase/Data_alias/basic/2021.1.3/changelog.xml       | 1 +
 entity/Address_entity/entityfields/zip/onValidation.js   | 8 +-------
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 .liquibase/Data_alias/basic/2021.1.3/UpdateAddrFormats.xml

diff --git a/.liquibase/Data_alias/basic/2021.1.3/UpdateAddrFormats.xml b/.liquibase/Data_alias/basic/2021.1.3/UpdateAddrFormats.xml
new file mode 100644
index 0000000000..15721750ea
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.1.3/UpdateAddrFormats.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="s.pongratz" id="cb065db3-bf61-4d6f-8887-d71540089a41">
+    <update tableName="AB_COUNTRYINFO">
+      <column name="ADDR_FORMAT" value="〒%Z%n%S%n%B %A%n%O%n%N"/>
+      <where>ISO2 = 'JP'</where>
+    </update>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.1.3/changelog.xml b/.liquibase/Data_alias/basic/2021.1.3/changelog.xml
index 64b38eb5ed..76079ed029 100644
--- a/.liquibase/Data_alias/basic/2021.1.3/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.1.3/changelog.xml
@@ -9,4 +9,5 @@
     <include relativeToChangelogFile="true" file="Grouptask/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Campaign/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Visitplan/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="UpdateAddrFormats.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/zip/onValidation.js b/entity/Address_entity/entityfields/zip/onValidation.js
index 31896dfdfa..64a5269035 100644
--- a/entity/Address_entity/entityfields/zip/onValidation.js
+++ b/entity/Address_entity/entityfields/zip/onValidation.js
@@ -1,11 +1,5 @@
-import("WsValidation_lib");
-import("system.translate");
 import("system.result");
 import("system.vars");
 import("PostalAddress_lib");
-import("Entity_lib");
 
-if (!WsValidationUtils.isWsEnabled(WsValidationType.get().TYPE_ZIP_NOMINATIM))
-{
-    result.string(AddressValidationUtils.validateZipField(vars.get("$field.COUNTRY"), vars.get("$local.value")));
-}
+result.string(AddressValidationUtils.validateZipField(vars.get("$field.COUNTRY"), vars.get("$local.value")));
-- 
GitLab