From 29b78fe9fdf5ff6e0c4a9e76a974d1267be7fcb1 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 16 Sep 2019 11:07:14 +0200
Subject: [PATCH] merge fixes
---
.../recordcontainers/db/conditionProcess.js | 3 ++-
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
index 536873314a..a2034cf361 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -7,4 +7,5 @@ var cond = SqlCondition.begin()
.andPrepareVars("DOCUMENTTEMPLATE.KIND", "$param.DocumentTemplateType_param")
.andPrepareVars("DOCUMENTTEMPLATE.CLASSIFICATION", "$param.DocumentTemplateTypeClassification_param");
-result.string(SqlUtils.translateStatementWithQuotes(cond.build("1=1")));
\ No newline at end of file
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
+result.string(cond.translate("1=1"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 37f94d19d6..3e689d4945 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5088,6 +5088,12 @@
<entry>
<key>Use template attachments</key>
</entry>
+ <entry>
+ <key>My Turnover</key>
+ </entry>
+ <entry>
+ <key>My Forecast</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
--
GitLab