diff --git a/.liquibase/Data_alias/basic/2020.1.1/changelog.xml b/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
index 7070cb88cfdc67dbb126680500fad85499f40887..f5686ce22ccea6e17c577957774efd2009a0dd7f 100644
--- a/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
@@ -2,5 +2,4 @@
<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="AlterTablesToDatetime.xml"/>
- <include relativeToChangelogFile="true" file="Notification/changelog.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.1/Notification/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/changelog.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.1/Notification/changelog.xml
rename to .liquibase/Data_alias/basic/2020.1.2/Notification/changelog.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.1/Notification/init_NotificationType.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.1/Notification/init_NotificationType.xml
rename to .liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.1/Notification/insert_NotificationState.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2020.1.1/Notification/insert_NotificationState.xml
rename to .liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 7696526b5b01d5485e47a5a69bbade95aa0c6317..1f2c05d8e7b344c7cbe3cd689c4b0c526cd8e56b 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -2,7 +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 file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
- <include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true"/>
- <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
+ <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
+ <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
+ <include file="Notification/changelog.xml" relativeToChangelogFile="true" />
<include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml b/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a4bbbd1638f60b4023e3ccab49955e358c011ba9
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml
@@ -0,0 +1,24 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<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">
+ <changeSet author="s.listl" id="38b13161-5163-48d9-9791-f9c7027cac62">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="f241b36a-c2fe-40be-9e2e-8293c700d096"/>
+ <column name="KEYID" value="WORKFLOWCATEGORYMARKETING"/>
+ <column name="TITLE" value="Marketing"/>
+ <column name="CONTAINER" value="WorkflowCategory"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="00a72718-554e-46ab-b83c-fb9b81be4be6"/>
+ <column name="KEYID" value="WORKFLOWCATEGORYRELEASE"/>
+ <column name="TITLE" value="Release"/>
+ <column name="CONTAINER" value="WorkflowCategory"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index a8cc53b406959a8797b32a02af71dd93e1576384..415dcce4162c36e2f1c7945a6082d40e3968a5b1 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,7 +14,7 @@
<include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
-
+
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
<!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
</databaseChangeLog>
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index a8fab2595e8795a739e854e715f1669bbd0477ac..0b6f95c995e62e440e543f9a9839fd760bf4a6c3 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -15,8 +15,6 @@
<mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
<textInputAllowed v="true" />
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/address/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/address/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Address_entity/entityfields/address/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
diff --git a/entity/Address_entity/entityfields/address/displayValueProcess.js b/entity/Address_entity/entityfields/address/displayValueProcess.js
deleted file mode 100644
index 18985f7a004b046c160746de13e8970eb6c87ece..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/address/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-
-// Needed for instant refresh if set by neon.setFieldValue
-// use the code if address webservice is active
-//result.string(vars.get("$field.ADDRESS"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/address/valueProcess.js b/entity/Address_entity/entityfields/address/valueProcess.js
deleted file mode 100644
index 2c9d496185be419f31c762709ca97d83a1ae4bd4..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/address/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("WsValidation_lib");
-import("system.vars");
-
-// use the code if address webservice is active
-//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/address_ws/valueProcess.js b/entity/Address_entity/entityfields/address_ws/valueProcess.js
index 5ccdf5a99f70f8b801158a56c1fa7b8136854130..2c7449d49d0036b67e5de71b0a7d7cf9b75876a9 100644
--- a/entity/Address_entity/entityfields/address_ws/valueProcess.js
+++ b/entity/Address_entity/entityfields/address_ws/valueProcess.js
@@ -1,3 +1,5 @@
+import("system.vars");
import("WsValidation_lib");
-WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
+if(!vars.get("$this.value"))
+ WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index f3a15f3c8ad189a57e5dd9c9b3167d59a5043bed..b14e753e4e989ccf0645d68cb7bca2f6cca765c4 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -119,7 +119,7 @@
</entityParameter>
<entityActionField>
<name>sendMail</name>
- <title>send mail</title>
+ <title>{SEND_MAIL}</title>
<onActionProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:AT</iconId>
<stateProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/stateProcess.js</stateProcess>
diff --git a/entity/Employee_entity/entityfields/contact_id/onValueChange.js b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
index d469435d5c78d77ed6371942df1cb330d36389d3..4a1dbe67e5fb2353cd24c297f9ca0c1eb08e9304 100644
--- a/entity/Employee_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
@@ -22,7 +22,7 @@ if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.r
neon.setFieldValues({
"$field.FIRSTNAME" : name[0] || "",
"$field.LASTNAME" : name[1] || "",
- "$field.EMAIL_ADDRESS" : name[2] || "",
+ "$field.EMAIL_ADDRESS" : name[2] || vars.get("$field.EMAIL_ADDRESS") || "",
"$field.TITLE" : username
});
}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
index 99e97c2dddc0cae705cdc328a215b226a386f227..559a598b48b1f347bf21ee32e097eacc741b1083 100644
--- a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
+++ b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
@@ -6,7 +6,7 @@ import("system.result");
import("Sql_lib");
var contactId = vars.get("$field.CONTACT_ID");
-if (contactId && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW))
+if (contactId)
{
var addresses = newSelect("ADDR, ADDR")
.from("COMMUNICATION")
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 3f08a4f669f0e68b3182f2d392daab2235930c23..50b11b29d038dfbffc77b87f3ba92e06474cc9d8 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -34,7 +34,7 @@
</entityField>
<entityField>
<name>CAPTION</name>
- <title>title</title>
+ <title>Title</title>
</entityField>
<entityField>
<name>CREATEDATE</name>
@@ -45,7 +45,7 @@
</entityField>
<entityField>
<name>DESCRIPTION</name>
- <title>description</title>
+ <title>Description</title>
</entityField>
<entityField>
<name>FORCEDPRIORITY</name>
@@ -124,7 +124,7 @@
</entityActionGroup>
<entityField>
<name>RESOLVEDPRIORITY</name>
- <title>priority</title>
+ <title>Priority</title>
<consumer>PrioKeywords</consumer>
<textInputAllowed v="false" />
</entityField>
diff --git a/entity/WorkflowStartConfig_entity/imageProcess.js b/entity/WorkflowStartConfig_entity/imageProcess.js
index 34147b89bd271ec01be2bb3fa1c6eb055186963f..8b918cbc285c80f90e305b0b2aee6655949db65f 100644
--- a/entity/WorkflowStartConfig_entity/imageProcess.js
+++ b/entity/WorkflowStartConfig_entity/imageProcess.js
@@ -2,5 +2,5 @@ import("system.result");
import("system.vars");
import("system.project");
-var contextModel = project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"));
+var contextModel = vars.get("$field.OBJECT_TYPE") && project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"));
result.string(contextModel ? contextModel[5] : "");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d339195f21f074660303e10b1a80ce278c3bb123..aac9f1e3a87bf48857bc5cd346144fd1c62abbb1 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6872,9 +6872,18 @@
<entry>
<key>Workflow Model</key>
</entry>
+ <entry>
+ <key>{SENT_MAIL}</key>
+ </entry>
<entry>
<key>The Sales Project can only be filled when a company has been specified</key>
</entry>
+ <entry>
+ <key>The workflow could not be deployed</key>
+ </entry>
+ <entry>
+ <key>Workflow deploy failed</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 a132152c5028d6e84f533b84d53bb64e431762fa..e5de76bd0bc339751a4b3cd18d4513ca92016220 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -32,6 +32,7 @@
</entry>
<entry>
<key>Finished</key>
+ <value>Abgeschlossen</value>
</entry>
<entry>
<key>Show my organisations</key>
@@ -8743,15 +8744,12 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>leadimport notification</key>
- <value>Leadimport Benachrichtigung</value>
</entry>
<entry>
<key>bulk mail sent</key>
- <value>Serienmail versendet</value>
</entry>
<entry>
<key>download ready</key>
- <value>Download bereit</value>
</entry>
<entry>
<key>No new recipients found that can be added to the bulk mail.</key>
@@ -8761,19 +8759,10 @@ Bitte Datumseingabe prüfen</value>
<key>Permission received</key>
<value>erhaltene Berechtigung</value>
</entry>
- <entry>
- <key>leadimport notification</key>
- </entry>
<entry>
<key>granted permission</key>
<value>vergebene Berechtigung</value>
</entry>
- <entry>
- <key>bulk mail sent</key>
- </entry>
- <entry>
- <key>download ready</key>
- </entry>
<entry>
<key>Receive new Department Permission</key>
<value>Neue Abteilungs-Berechtigung erhalten</value>
@@ -8789,10 +8778,6 @@ Bitte Datumseingabe prüfen</value>
<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>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>export using the selected template</key>
<value>Mit der ausgewählten Vorlage Exportieren</value>
@@ -8807,6 +8792,16 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Workflow Model</key>
</entry>
+ <entry>
+ <key>{SEND_MAIL}</key>
+ <value>Email versenden</value>
+ </entry>
+ <entry>
+ <key>The workflow could not be deployed</key>
+ </entry>
+ <entry>
+ <key>Workflow deploy failed</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 dd32b2a7b3caf16d762271d43e41d228628bf79d..f2827dd55b21fc315f7acc480583a72d5eff0ace 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6941,6 +6941,17 @@
<entry>
<key>The Sales Project can only be filled when a company has been specified</key>
</entry>
+
+ <entry>
+ <key>{SEND_MAIL}</key>
+ <value>Send mail</value>
+ </entry>
+ <entry>
+ <key>The workflow could not be deployed</key>
+ </entry>
+ <entry>
+ <key>Workflow deploy failed</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index 9e876a6e5cb22b37ad233e3c14ab8c25073b2169..6e749e3cfbd8e9a0e2e9b348b4c8186d45aae1ec 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>OrderDetail_view</name>
- <title>Texts</title>
+ <title>Cover letter</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index b76b54dcaaff68957fa6d0c26f48d5a57a2f9c02..428d0c02e07af523318e7f24d35f87230edab64f 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -29,16 +29,16 @@
<entityField>#ENTITY</entityField>
<view>OrderDetail_view</view>
</neonViewReference>
- <neonViewReference>
- <name>b3014999-da86-45ae-86ae-feb738d62906</name>
- <entityField>Documents</entityField>
- <view>DocumentFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>7ec102f5-fb45-44a7-9bbf-0eba7f1536d7</name>
<entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>b3014999-da86-45ae-86ae-feb738d62906</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>351a9b5d-a050-4fb9-b3e4-402dcd84b331</name>
<entityField>Tasks</entityField>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index 5879614ec37bdf2d2ec54e12e0dbf57a17d05042..4c6e8a7eac674bd309fbe4aefe1f9bda7c40bba0 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -31,6 +31,10 @@
<name>a8dcb2bb-bb09-4a6e-b0f0-1b4d1111eb22</name>
<entityField>UNIT</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
+ <entityField>VAT</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>33ef0703-d4ea-4187-b555-648a1733ee99</name>
<entityField>PRICE</entityField>
@@ -39,22 +43,18 @@
<name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
<entityField>DISCOUNT</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
- <entityField>VAT</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
<entityField>OPTIONAL</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>eecc066d-e380-4fe7-9e9b-99d80842981d</name>
<entityField>TotalPrice</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
<treeTableViewTemplate>
@@ -77,6 +77,10 @@
<name>4998fc65-67b7-465d-9891-808dcf0fe080</name>
<entityField>UNIT</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>e545cb87-e4a5-4154-89b1-1f88a6d59fde</name>
+ <entityField>VAT</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>b4470ca6-89e8-421b-bb91-7d32f9c48aa2</name>
<entityField>PRICE</entityField>
@@ -85,22 +89,18 @@
<name>0c533079-4b39-4412-8de5-086bf7a08706</name>
<entityField>DISCOUNT</entityField>
</neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>e545cb87-e4a5-4154-89b1-1f88a6d59fde</name>
- <entityField>VAT</entityField>
- </neonTreeTableColumn>
<neonTreeTableColumn>
<name>9ac44050-ea77-43d2-b0fe-f7ca411b91e7</name>
<entityField>OPTIONAL</entityField>
</neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>4d4f204a-1c2b-4587-93b9-df03f31da38e</name>
- <entityField>INFO</entityField>
- </neonTreeTableColumn>
<neonTreeTableColumn>
<name>c44b5bc2-4283-4dca-bd20-bd048e05fe45</name>
<entityField>TotalPrice</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>4d4f204a-1c2b-4587-93b9-df03f31da38e</name>
+ <entityField>INFO</entityField>
+ </neonTreeTableColumn>
</columns>
</treeTableViewTemplate>
</children>
diff --git a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
index 9c98d1fe51548d2c24a3f1e415cf83a1de05e69d..cdac1faccf7f16acf27044fd57f434dea9502e3c 100644
--- a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
+++ b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
@@ -3,9 +3,9 @@
<name>WorkflowStartConfigFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <groupLayout>
+ <boxLayout>
<name>layout</name>
- </groupLayout>
+ </boxLayout>
</layout>
<children>
<tableViewTemplate>
@@ -24,19 +24,5 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treeTableViewTemplate>
- <name>Treetable</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTreeTableColumn>
- <name>4874074f-80af-4e99-8449-2a4dc4428360</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>d479a082-ea95-40c6-81a2-9318fcf9ce98</name>
- <entityField>TRIGGER_EVENT</entityField>
- </neonTreeTableColumn>
- </columns>
- </treeTableViewTemplate>
</children>
</neonView>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index b4d74a2a8f0cb51a439f5c8991d3d1e54a77602b..04e469c42da0bb82885071aec0350704dc6d59bc 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -21,6 +21,11 @@ $KeywordRegistry._autoPad = function(pKey){return (pKey + "
$KeywordRegistry.attributeType = function(){return "AttributeType";};
$KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType";};
+$KeywordRegistry.keywordAttributeType$char = function(){return "CHAR";};
+$KeywordRegistry.keywordAttributeType$number = function(){return "NUMBER";};
+$KeywordRegistry.keywordAttributeType$bool = function(){return "BOOLEAN";};
+$KeywordRegistry.keywordAttributeType$longChar = function(){return "LONGCHAR";};
+
$KeywordRegistry.contractPayment = function(){return "ContractPayment";};
$KeywordRegistry.contractStatus = function(){return "ContractStatus";};