From 442084b575a1c8dc1ed8dd31d3e8a06c10913f00 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 15 Feb 2019 15:18:49 +0100
Subject: [PATCH] refactorings & todo refactorings
---
.../recordcontainers/db/conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../country/displayValueProcess.js | 2 +-
.../entityfields/zip/onValidation.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../AttributeUsage_entity.aod | 11 +++-
.../object_type/possibleItemsProcess.js | 4 --
entity/Context_entity/Context_entity.aod | 6 ++
.../recordcontainers/db/conditionProcess.js | 2 +-
entity/Offer_entity/conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
entity/Person_entity/conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../_____LANGUAGE_EXTRA.aod | 54 +++++++++++++++++-
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 55 ++++++++++++++++++-
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 54 +++++++++++++++++-
.../_____PREFERENCES_PROJECT.aod | 2 +-
30 files changed, 194 insertions(+), 38 deletions(-)
delete mode 100644 entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js
diff --git a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
index d297c7d58b..af5991c0cd 100644
--- a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
@@ -6,5 +6,5 @@ var cond = SqlCondition.begin()
.andPrepareVars("ACTIVITYLINK.OBJECT_ROWID", "$param.ObjectRowid_param")
.andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectType_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index 42b0bbbe10..f8ca95a041 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -16,6 +16,6 @@ if(vars.exists("$param.OnlyInnate_param") && vars.get("$param.OnlyInnate_param")
cond.andPrepare("ACTIVITY.CREATOR", vars.get("$sys.user"));
}
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
var resCond = db.translateCondition(cond.build("1 = 1"));
result.string(resCond);
diff --git a/entity/Address_entity/entityfields/country/displayValueProcess.js b/entity/Address_entity/entityfields/country/displayValueProcess.js
index 11851ccdb2..22c043fdc3 100644
--- a/entity/Address_entity/entityfields/country/displayValueProcess.js
+++ b/entity/Address_entity/entityfields/country/displayValueProcess.js
@@ -4,7 +4,7 @@ import("system.translate");
import("system.result");
import("Sql_lib");
-//TODO: temporary testing code
+//TODO: temporary testing code -> will be replaced with title-mechanic
var isoCode = vars.get("$field.COUNTRY");
var countryName = db.cell(SqlCondition.begin().andPrepare("AB_COUNTRYINFO.ISO2", isoCode).buildSql("select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO"));
countryName = translate.text(countryName);
diff --git a/entity/Address_entity/entityfields/zip/onValidation.js b/entity/Address_entity/entityfields/zip/onValidation.js
index 59eb04f1cd..4ab5fababa 100644
--- a/entity/Address_entity/entityfields/zip/onValidation.js
+++ b/entity/Address_entity/entityfields/zip/onValidation.js
@@ -10,6 +10,6 @@ var zipCode = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ZIP"));
var message = "";
var isValid = AddressValidationUtils.isValidZip(countryCode, zipCode);
if (!isValid)
- message = translate.text("ZIP code is not valid");//TODO: better message text
+ message = translate.text("The ZIP code does not match the format of the country.");
result.string(message);
\ No newline at end of file
diff --git a/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js b/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js
index d07a6fc35d..c0867f5bce 100644
--- a/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = SqlCondition.begin()
.andPrepareVars("APPOINTMENTLINK.APPOINTMENT_ID", "$param.AppointmentId_param")
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 04eb720905..9528f03da5 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -12,7 +12,7 @@
<entityField>
<name>OBJECT_TYPE</name>
<title>Context</title>
- <possibleItemsProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js</possibleItemsProcess>
+ <consumer>Contexts</consumer>
</entityField>
<entityField>
<name>AB_ATTRIBUTEUSAGEID</name>
@@ -55,6 +55,15 @@
<searchable v="false" />
<onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js</onValidation>
</entityField>
+ <entityConsumer>
+ <name>Contexts</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Context</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js b/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js
deleted file mode 100644
index ad26576d8f..0000000000
--- a/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-//TODO: when available, use a function to get the possible contexts
-result.object([["Organisation_context", "Org"]]);
\ No newline at end of file
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index ebf5d2c1bb..4742ecca3f 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -49,6 +49,12 @@
<fieldName>Contexts</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>628bd4db-3b31-4337-88ac-1c000307836f</name>
+ <entityName>AttributeUsage_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Contract_entity/recordcontainers/db/conditionProcess.js b/entity/Contract_entity/recordcontainers/db/conditionProcess.js
index fc35ae3505..e7df60028a 100644
--- a/entity/Contract_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Contract_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = SqlCondition.begin().andPrepareVars("CONTRACT.CONTACT_ID", "$param.RelId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Offer_entity/conditionProcess.js b/entity/Offer_entity/conditionProcess.js
index 7cab121602..46b77172c4 100644
--- a/entity/Offer_entity/conditionProcess.js
+++ b/entity/Offer_entity/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("OFFER.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/conditionProcess.js b/entity/Offer_entity/recordcontainers/db/conditionProcess.js
index 7cab121602..46b77172c4 100644
--- a/entity/Offer_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Offer_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("OFFER.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/conditionProcess.js b/entity/Order_entity/recordcontainers/db/conditionProcess.js
index d470d3cb07..11dd858114 100644
--- a/entity/Order_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Order_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESORDER.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 0c6aae84bb..6e3446d992 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -4,7 +4,7 @@ import("system.db");
import("system.result");
import("Sql_lib");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(
SqlCondition.begin()
.andPrepareVars("ORGANISATION.ORGANISATIONID", "$param.ContactId_param")
diff --git a/entity/Person_entity/conditionProcess.js b/entity/Person_entity/conditionProcess.js
index a19303b987..0c7d6ef5de 100644
--- a/entity/Person_entity/conditionProcess.js
+++ b/entity/Person_entity/conditionProcess.js
@@ -7,5 +7,5 @@ cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param");
cond.andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
//TODO; add OBJECT_ID (probably another param)
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
index b65379fa6d..e8302d0041 100644
--- a/entity/Person_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -6,5 +6,5 @@ var cond = new SqlCondition();
cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param");
cond.andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/conditionProcess.js b/entity/SalesprojectCompetition_entity/conditionProcess.js
index 7211c89315..f28e2da06f 100644
--- a/entity/SalesprojectCompetition_entity/conditionProcess.js
+++ b/entity/SalesprojectCompetition_entity/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_COMPETITION.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js
index 7211c89315..f28e2da06f 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_COMPETITION.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectCycle_entity/conditionProcess.js b/entity/SalesprojectCycle_entity/conditionProcess.js
index be87512e0c..01636c9c6c 100644
--- a/entity/SalesprojectCycle_entity/conditionProcess.js
+++ b/entity/SalesprojectCycle_entity/conditionProcess.js
@@ -6,5 +6,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_CYCLE.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectCycle_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectCycle_entity/recordcontainers/db/conditionProcess.js
index be87512e0c..01636c9c6c 100644
--- a/entity/SalesprojectCycle_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectCycle_entity/recordcontainers/db/conditionProcess.js
@@ -6,5 +6,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_CYCLE.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/conditionProcess.js b/entity/SalesprojectForecast_entity/conditionProcess.js
index ab98558257..647c25565d 100644
--- a/entity/SalesprojectForecast_entity/conditionProcess.js
+++ b/entity/SalesprojectForecast_entity/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_FORECAST.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js
index ab98558257..647c25565d 100644
--- a/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_FORECAST.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/conditionProcess.js b/entity/SalesprojectMember_entity/conditionProcess.js
index d7a57bbf3f..bfd5554266 100644
--- a/entity/SalesprojectMember_entity/conditionProcess.js
+++ b/entity/SalesprojectMember_entity/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_MEMBER.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js
index d7a57bbf3f..bfd5554266 100644
--- a/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_MEMBER.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/conditionProcess.js b/entity/SalesprojectSource_entity/conditionProcess.js
index e319b875eb..073fed32ea 100644
--- a/entity/SalesprojectSource_entity/conditionProcess.js
+++ b/entity/SalesprojectSource_entity/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_SOURCE.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js
index e319b875eb..073fed32ea 100644
--- a/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js
@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_SOURCE.SALESPROJECT_ID", "$param.SalesprojectId_param");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js b/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js
index 78f4834ba9..453de01851 100644
--- a/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js
@@ -4,7 +4,7 @@ import("system.db");
import("system.result");
import("Sql_lib");
-//TODO: use a preparedCondition when available
+//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(SqlCondition.begin()
.andPrepareVars("TIMETRACKING.OBJECT_ID", "$param.ObjectId_param")
.andPrepareVars("TIMETRACKING.ROW_ID", "$param.RowId_param")
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index c1c8d1700a..5491aec287 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -738,9 +738,6 @@
<entry>
<key>Native Name</key>
</entry>
- <entry>
- <key>ZIP code is not valid</key>
- </entry>
<entry>
<key>Rabatt</key>
</entry>
@@ -2286,6 +2283,57 @@
<entry>
<key>SAL</key>
</entry>
+ <entry>
+ <key>Checkbox</key>
+ </entry>
+ <entry>
+ <key>Numeric value</key>
+ </entry>
+ <entry>
+ <key>decline</key>
+ </entry>
+ <entry>
+ <key>Text</key>
+ </entry>
+ <entry>
+ <key>Group</key>
+ </entry>
+ <entry>
+ <key>Combobox</key>
+ </entry>
+ <entry>
+ <key>tentative</key>
+ </entry>
+ <entry>
+ <key>${NUMBER}</key>
+ </entry>
+ <entry>
+ <key>Name \&quot;%0\&quot; already used for container \&quot;%1\&quot;</key>
+ </entry>
+ <entry>
+ <key>CHAR_VALUE</key>
+ </entry>
+ <entry>
+ <key>Keyword Attribute</key>
+ </entry>
+ <entry>
+ <key>in</key>
+ </entry>
+ <entry>
+ <key>Keyword Attribute Values</key>
+ </entry>
+ <entry>
+ <key>Boolean value</key>
+ </entry>
+ <entry>
+ <key>accept</key>
+ </entry>
+ <entry>
+ <key>The ZIP code does not match the format of the country.</key>
+ </entry>
+ <entry>
+ <key>String value</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 65445eea66..d3719f8ce7 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1206,9 +1206,6 @@
<entry>
<key>Native Name</key>
</entry>
- <entry>
- <key>ZIP code is not valid</key>
- </entry>
<entry>
<key>Rabatt</key>
</entry>
@@ -2638,6 +2635,58 @@
<entry>
<key>SAL</key>
</entry>
+ <entry>
+ <key>Checkbox</key>
+ </entry>
+ <entry>
+ <key>Numeric value</key>
+ </entry>
+ <entry>
+ <key>decline</key>
+ </entry>
+ <entry>
+ <key>Text</key>
+ </entry>
+ <entry>
+ <key>Group</key>
+ </entry>
+ <entry>
+ <key>Combobox</key>
+ </entry>
+ <entry>
+ <key>tentative</key>
+ </entry>
+ <entry>
+ <key>${NUMBER}</key>
+ </entry>
+ <entry>
+ <key>Name \&quot;%0\&quot; already used for container \&quot;%1\&quot;</key>
+ </entry>
+ <entry>
+ <key>CHAR_VALUE</key>
+ </entry>
+ <entry>
+ <key>Keyword Attribute</key>
+ </entry>
+ <entry>
+ <key>in</key>
+ </entry>
+ <entry>
+ <key>Keyword Attribute Values</key>
+ </entry>
+ <entry>
+ <key>Boolean value</key>
+ </entry>
+ <entry>
+ <key>accept</key>
+ </entry>
+ <entry>
+ <key>The ZIP code does not match the format of the country.</key>
+ <value>Die Postleitzahl hat nicht das Format des ausgewählten Landes.</value>
+ </entry>
+ <entry>
+ <key>String value</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index ae7af90419..503b12c83b 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -747,9 +747,6 @@
<entry>
<key>Native Name</key>
</entry>
- <entry>
- <key>ZIP code is not valid</key>
- </entry>
<entry>
<key>Rabatt</key>
</entry>
@@ -2308,6 +2305,57 @@
<entry>
<key>SAL</key>
</entry>
+ <entry>
+ <key>Checkbox</key>
+ </entry>
+ <entry>
+ <key>Numeric value</key>
+ </entry>
+ <entry>
+ <key>decline</key>
+ </entry>
+ <entry>
+ <key>Text</key>
+ </entry>
+ <entry>
+ <key>Group</key>
+ </entry>
+ <entry>
+ <key>Combobox</key>
+ </entry>
+ <entry>
+ <key>tentative</key>
+ </entry>
+ <entry>
+ <key>${NUMBER}</key>
+ </entry>
+ <entry>
+ <key>Name \&quot;%0\&quot; already used for container \&quot;%1\&quot;</key>
+ </entry>
+ <entry>
+ <key>CHAR_VALUE</key>
+ </entry>
+ <entry>
+ <key>Keyword Attribute</key>
+ </entry>
+ <entry>
+ <key>in</key>
+ </entry>
+ <entry>
+ <key>Keyword Attribute Values</key>
+ </entry>
+ <entry>
+ <key>Boolean value</key>
+ </entry>
+ <entry>
+ <key>accept</key>
+ </entry>
+ <entry>
+ <key>The ZIP code does not match the format of the country.</key>
+ </entry>
+ <entry>
+ <key>String value</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 336d6b092b..5edf76c777 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.3">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic2019</projectName>
+ <projectName>xRM-Basic5</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
--
GitLab