merge fixes

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")));
+//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
\ No newline at end of file
+result.string(cond.translate("1=1"));
\ No newline at end of file

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>