diff --git a/.liquibase/Data_alias/basic/2019.3.0/changelog.xml b/.liquibase/Data_alias/basic/2019.3.0/changelog.xml
index 11d4e053d3b3aa237177feb136ff4dfd2566acd8..009ebeeab3f94baae4054f2100444de5ea6a1b8a 100644
--- a/.liquibase/Data_alias/basic/2019.3.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.3.0/changelog.xml
@@ -2,8 +2,8 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="update_assistance_attributes.xml"/>
-
+
<include relativeToChangelogFile="true" file="alter_DocumentTemplate_addReplacementName.xml"/>
<include relativeToChangelogFile="true" file="insert_DocumentTemplateCategory_templates.xml"/>
<include relativeToChangelogFile="true" file="alter_Bulkmail_use_template_attachments.xml"/>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/entity/AddressType_entity/recordcontainers/db/conditionProcess.js b/entity/AddressType_entity/recordcontainers/db/conditionProcess.js
index 4b5b086332e8de30018abfb04e57757ed0e56bdf..c80d36420df3b630a081faca76cbb5e4207aed07 100644
--- a/entity/AddressType_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/AddressType_entity/recordcontainers/db/conditionProcess.js
@@ -21,5 +21,5 @@ if (usageFilter)
from AB_KEYWORD_ATTRIBUTERELATION ", null, ")"));
}
-cond = SqlUtils.translateStatementWithQuotes(cond.build("1 = 2"));
+cond = SqlUtils.cond.translate("1 = 2");
result.string(cond);
\ No newline at end of file
diff --git a/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js
index a1b4dd1db008a3903df91904d1bcc4d5db3e4ba8..de5da8a97a96d9c22dc94f3aea104374da06d8ef 100644
--- a/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js
@@ -20,5 +20,5 @@ if (usageFilter)
from AB_KEYWORD_ATTRIBUTERELATION ", null, ")"));
}
-cond = SqlUtils.translateStatementWithQuotes(cond.build("1 = 2"));
+cond = SqlUtils.cond.translate("1 = 2");
result.string(cond);
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
index a2034cf361cf6171fbb785205cc33359826f71a8..edcb27db9be3a2e3b082dd36852fba43398f3738 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -7,5 +7,4 @@ var cond = SqlCondition.begin()
.andPrepareVars("DOCUMENTTEMPLATE.KIND", "$param.DocumentTemplateType_param")
.andPrepareVars("DOCUMENTTEMPLATE.CLASSIFICATION", "$param.DocumentTemplateTypeClassification_param");
-//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
-result.string(cond.translate("1=1"));
\ No newline at end of file
+result.string(cond.translate("1=1"));
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index bf7d5dc4e4a9e234f05889d73bebd79cab9c3e98..3890b59dbead3b4f881c0f0c28165d015e748d05 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6275,7 +6275,6 @@
</entry>
<entry>
<key>Action '</key>
- <value></value>
</entry>
<entry>
<key>No duplicates allowed: action '</key>
@@ -6362,7 +6361,6 @@
</entry>
<entry>
<key>Receipt Footer Text</key>
- <value>Beleg Fußtext</value>
</entry>
<entry>
<key>Delivery note</key>
@@ -6380,7 +6378,6 @@
</entry>
<entry>
<key>Receipt Header Text</key>
- <value>Beleg Kopftext</value>
</entry>
<entry>
<key>Cancellation</key>
@@ -6397,46 +6394,44 @@
<value>Gutschrift</value>
</entry>
<entry>
- <key>Show tickets where I am editor</key>
+ <key>The replacement name has to be unique.</key>
</entry>
<entry>
- <key>My tickets</key>
- <value>Meine Tickets</value>
+ <key>Only .odt files are supported for bulkletters.</key>
</entry>
<entry>
- <key>Replacement name</key>
- <value>Ersetzungsname</value>
+ <key>Show tickets where I am editor</key>
</entry>
<entry>
- <key>The replacement name has to be unique.</key>
- <value>Der Ersetzungsname muss eindeutig sein.</value>
+ <key>My Turnover</key>
</entry>
<entry>
- <key>Only .odt files are supported for bulkletters.</key>
- <value>Es werden nur .odt Dateien für Serienbriefe unterstützt.</value>
+ <key>Wrong filetype for the current document template type and classification.</key>
</entry>
<entry>
- <key>Preview</key>
+ <key>Use template attachments</key>
</entry>
<entry>
- <key>Action not supported</key>
- <value>Aktion wird nicht unterstützt</value>
+ <key>My tickets</key>
+ <value>Meine Tickets</value>
</entry>
<entry>
- <key>Wrong filetype for the current document template type and classification.</key>
- <value>Falscher Dateityp für den aktuellen Vorlagentyp und die aktuelle Klasse.</value>
+ <key>HTML template - Only for .html</key>
</entry>
<entry>
- <key>HTML template - Only for .html</key>
- <value>HTML Template - Nur für .html</value>
+ <key>Preview</key>
+ </entry>
+ <entry>
+ <key>My Forecast</key>
</entry>
<entry>
<key>Plaintext template - Only for .txt and .html</key>
- <value>Reines Texttemplate - Nur für .txt und .html</value>
</entry>
<entry>
- <key>Use template attachments</key>
- <value>Verwende Vorlagenanhänge</value>
+ <key>Action not supported</key>
+ </entry>
+ <entry>
+ <key>Replacement name</key>
</entry>
<entry>
<key>Copy bulkmail</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 3d160bb9cbebb9a00829a5be3cccad49f1a63522..c11e3769e4902e074b537a112de88d7ab58dac0c 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5106,43 +5106,43 @@
<key>Credit</key>
</entry>
<entry>
- <key>Show tickets where I am editor</key>
+ <key>The replacement name has to be unique.</key>
</entry>
<entry>
- <key>My tickets</key>
+ <key>Only .odt files are supported for bulkletters.</key>
</entry>
<entry>
- <key>Replacement name</key>
+ <key>Show tickets where I am editor</key>
</entry>
<entry>
- <key>The replacement name has to be unique.</key>
+ <key>My Turnover</key>
</entry>
<entry>
- <key>Only .odt files are supported for bulkletters.</key>
+ <key>Wrong filetype for the current document template type and classification.</key>
</entry>
<entry>
- <key>Preview</key>
+ <key>Use template attachments</key>
</entry>
<entry>
- <key>Action not supported</key>
+ <key>My tickets</key>
</entry>
<entry>
- <key>Wrong filetype for the current document template type and classification.</key>
+ <key>HTML template - Only for .html</key>
</entry>
<entry>
- <key>HTML template - Only for .html</key>
+ <key>Preview</key>
</entry>
<entry>
- <key>Plaintext template - Only for .txt and .html</key>
+ <key>My Forecast</key>
</entry>
<entry>
- <key>Use template attachments</key>
+ <key>Plaintext template - Only for .txt and .html</key>
</entry>
<entry>
- <key>My Turnover</key>
+ <key>Action not supported</key>
</entry>
<entry>
- <key>My Forecast</key>
+ <key>Replacement name</key>
</entry>
<entry>
<key>Copy bulkmail</key>