Skip to content
Snippets Groups Projects
Commit 1cbc9d61 authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch '2020.1.2' into '2020.1' 

2020.1.2

See merge request xrm/basic!309
parents 6a6d6922 8d47b1d7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 108 additions and 53 deletions
entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
+ 1
− 0
View file @ 1cbc9d61
......@@ -5,6 +5,7 @@
<documentation>%aditoprj%/entity/WorkflowInstance_entity/documentation.adoc</documentation>
<title>Workflow instance</title>
<contentTitleProcess>%aditoprj%/entity/WorkflowInstance_entity/contentTitleProcess.js</contentTitleProcess>
<initFilterProcess>%aditoprj%/entity/WorkflowInstance_entity/initFilterProcess.js</initFilterProcess>
<titlePlural>Workflow instances</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
......
entity/WorkflowInstance_entity/initFilterProcess.js 0 → 100644
+ 17
− 0
View file @ 1cbc9d61
import("system.result");
import("system.translate");
var filterOnlyUnfinished = {
type : "group",
operator : "AND",
childs : [{
type : "row",
name : "ISFINISHED",
operator : "EQUAL",
value : translate.text("No"),
key : "false",
contenttype : "BOOLEAN"
}]
};
result.string(JSON.stringify(filterOnlyUnfinished));
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 30
− 15
View file @ 1cbc9d61
......@@ -6807,49 +6807,64 @@
<key>Settings</key>
</entry>
<entry>
<key>workflow notification</key>
<key>No new recipients found that can be added to the bulk mail.</key>
</entry>
<entry>
<key>Permission received</key>
<key>Add Recipients</key>
</entry>
<entry>
<key>leadimport notification</key>
<key>Add Participants</key>
</entry>
<entry>
<key>granted permission</key>
<key>Download letter and create Activity</key>
</entry>
<entry>
<key>bulk mail sent</key>
<key>and open Report</key>
</entry>
<entry>
<key>download ready</key>
<key>export</key>
</entry>
<entry>
<key>No new recipients found that can be added to the bulk mail.</key>
<key>export using the selected template</key>
</entry>
<entry>
<key>Add Recipients</key>
<key>No new recipients found that can be added to the serial letter.</key>
</entry>
<entry>
<key>Add Participants</key>
<key>send mail</key>
</entry>
<entry>
<key>Download letter and create Activity</key>
<key>and open modeler</key>
</entry>
<entry>
<key>and open Report</key>
<key>Create model</key>
</entry>
<entry>
<key>export</key>
<key>Edit workflow</key>
</entry>
<entry>
<key>export using the selected template</key>
<key>Receive new Department Permission</key>
</entry>
<entry>
<key>No new recipients found that can be added to the serial letter.</key>
<key>Receive new User Permission</key>
</entry>
<entry>
<key>send mail</key>
<key>workflow notification</key>
</entry>
<entry>
<key>Permission received</key>
</entry>
<entry>
<key>leadimport notification</key>
</entry>
<entry>
<key>granted permission</key>
</entry>
<entry>
<key>bulk mail sent</key>
</entry>
<entry>
<key>download ready</key>
</entry>
<entry>
<key>Add new Department Permission</key>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 32
− 19
View file @ 1cbc9d61
......@@ -8187,6 +8187,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Send email</key>
<value>E-Mail losschicken</value>
</entry>
<entry>
<key>Activites</key>
......@@ -8734,51 +8735,63 @@ Bitte Datumseingabe prüfen</value>
<value>gültig ab (in </value>
</entry>
<entry>
<key>workflow notification</key>
<key>No new recipients found that can be added to the bulk mail.</key>
<value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
</entry>
<entry>
<key>Permission received</key>
<value>erhaltene Berechtigung</value>
<key>Add Recipients</key>
<value>Empfänger hinzufügen</value>
</entry>
<entry>
<key>leadimport notification</key>
<key>Add Participants</key>
<value>Teilnehmer hinzufügen</value>
</entry>
<entry>
<key>granted permission</key>
<value>vergebene Berechtigung</value>
<key>Download letter and create Activity</key>
<value>Brief herunterladen und Aktivität erstellen</value>
</entry>
<entry>
<key>bulk mail sent</key>
<key>and open Report</key>
<value>und Report öffnen</value>
</entry>
<entry>
<key>download ready</key>
<key>export</key>
</entry>
<entry>
<key>export using the selected template</key>
<value>Mit der ausgewählten Vorlage Exportieren</value>
</entry>
<entry>
<key>No new recipients found that can be added to the serial letter.</key>
<value>Keine neuen Empfänger, die zum Serienbrief werden können, gefunden.</value>
</entry>
<entry>
<key>send mail</key>
<value>E-Mail losschicken</value>
</entry>
<entry>
<key>Receive new Department Permission</key>
<value>Neue Abteilungs-Berechtigung erhalten</value>
</entry>
<entry>
<key>Receive new User Permission</key>
<value>Neue Benutzer-Berechtigung erhalten</value>
</entry>
<entry>
<key>export</key>
<key>workflow notification</key>
</entry>
<entry>
<key>No new recipients found that can be added to the serial letter.</key>
<value>Keine neuen Empfänger, die zum Serienbrief werden können, gefunden.</value>
<key>Permission received</key>
</entry>
<entry>
<key>No new recipients found that can be added to the bulk mail.</key>
<value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
<key>leadimport notification</key>
</entry>
<entry>
<key>export using the selected template</key>
<value>Mit der ausgewählten Vorlage Exportieren</value>
<key>granted permission</key>
</entry>
<entry>
<key>send mail</key>
<value>E-Mail losschicken</value>
<key>bulk mail sent</key>
</entry>
<entry>
<key>download ready</key>
</entry>
<entry>
<key>Download letter and create Activity</key>
......
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 26
− 17
View file @ 1cbc9d61
......@@ -6873,55 +6873,64 @@
<key>Settings</key>
</entry>
<entry>
<key>workflow notification</key>
<key>No new recipients found that can be added to the bulk mail.</key>
</entry>
<entry>
<key>Permission received</key>
<key>Add Recipients</key>
</entry>
<entry>
<key>leadimport notification</key>
<key>Add Participants</key>
</entry>
<entry>
<key>granted permission</key>
<key>Download letter and create Activity</key>
</entry>
<entry>
<key>bulk mail sent</key>
<key>and open Report</key>
</entry>
<entry>
<key>download ready</key>
<key>export</key>
</entry>
<entry>
<key>No new recipients found that can be added to the bulk mail.</key>
<key>export using the selected template</key>
</entry>
<entry>
<key>Add Recipients</key>
<key>No new recipients found that can be added to the serial letter.</key>
</entry>
<entry>
<key>Add Participants</key>
<key>send mail</key>
</entry>
<entry>
<key>Download letter and create Activity</key>
<key>Receive new Department Permission</key>
</entry>
<entry>
<key>and open Report</key>
<key>Receive new User Permission</key>
</entry>
<entry>
<key>export</key>
<key>and open modeler</key>
</entry>
<entry>
<key>export using the selected template</key>
<key>Create model</key>
</entry>
<entry>
<key>No new recipients found that can be added to the serial letter.</key>
<key>Edit workflow</key>
</entry>
<entry>
<key>send mail</key>
<key>workflow notification</key>
</entry>
<entry>
<key>Receive new Department Permission</key>
<key>Permission received</key>
</entry>
<entry>
<key>Receive new User Permission</key>
<key>leadimport notification</key>
</entry>
<entry>
<key>granted permission</key>
</entry>
<entry>
<key>bulk mail sent</key>
</entry>
<entry>
<key>download ready</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
......
process/AttributeFilter_lib/process.js
+ 1
− 1
View file @ 1cbc9d61
......@@ -155,7 +155,7 @@ AttributeFilterExtensionMaker.getFilterValues = function(pFilter)
var attrType = name.type;
if (attrType == $AttributeTypes.VOID.toString())
attrType = $AttributeTypes.BOOLEAN.toString();
var res = AttributeUtil.getPossibleListValues(attributeId, attrType);
var res = AttributeUtil.getPossibleListValues(attributeId, attrType, true);
if (res == null)
res = [];
return res;
......
process/Attribute_lib/process.js
+ 1
− 1
View file @ 1cbc9d61
......@@ -148,7 +148,7 @@ AttributeUtil.getPossibleListValues = function (pAttributeId, pAttributeType, pI
{
var attributeId = pAttributeId;
var attrType = pAttributeType.trim();
var onlyActives = (pIncludeInactives == undefined ? false : pIncludeInactives);
var onlyActives = !pIncludeInactives;
if (attrType == $AttributeTypes.COMBO.toString())
{
var valuesSelect = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_NAME")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment