Skip to content
Snippets Groups Projects
Commit d88cc7f0 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch '2020.1.2' into 2020.1

parents 84187473 112074f8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 70 additions and 43 deletions
.liquibase/Data_alias/basic/2020.1.1/changelog.xml
+ 0
− 1
View file @ d88cc7f0
......@@ -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>
.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+ 3
− 2
View file @ d88cc7f0
......@@ -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>
.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml 0 → 100644
+ 24
− 0
View file @ d88cc7f0
<?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>
.liquibase/Data_alias/changelog.xml
+ 1
− 1
View file @ d88cc7f0
......@@ -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
entity/Address_entity/Address_entity.aod
+ 0
− 2
View file @ d88cc7f0
......@@ -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>
......
entity/Address_entity/entityfields/address/displayValueProcess.js deleted 100644 → 0
+ 0
− 6
View file @ 84187473
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
entity/Address_entity/entityfields/address/valueProcess.js deleted 100644 → 0
+ 0
− 6
View file @ 84187473
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
entity/Address_entity/entityfields/address_ws/valueProcess.js
+ 3
− 1
View file @ d88cc7f0
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
entity/Email_entity/Email_entity.aod
+ 1
− 1
View file @ d88cc7f0
......@@ -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>
......
entity/Employee_entity/entityfields/contact_id/onValueChange.js
+ 1
− 1
View file @ d88cc7f0
......@@ -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
entity/Employee_entity/entityfields/email_address/dropDownProcess.js
+ 1
− 1
View file @ d88cc7f0
......@@ -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")
......
entity/Notification_entity/Notification_entity.aod
+ 3
− 3
View file @ d88cc7f0
......@@ -34,7 +34,7 @@
</entityField>
<entityField>
<name>CAPTION</name>
<title>title</title>
<title>Title</title>
</entityField>
<entityField>
<name>CREATIONDATE</name>
......@@ -45,7 +45,7 @@
</entityField>
<entityField>
<name>DESCRIPTION</name>
<title>description</title>
<title>Description</title>
</entityField>
<entityField>
<name>FORCEDPRIORITY</name>
......@@ -127,7 +127,7 @@
</entityActionField>
<entityField>
<name>RESOLVEDPRIORITY</name>
<title>priority</title>
<title>Priority</title>
<consumer>PrioKeywords</consumer>
<textInputAllowed v="false" />
</entityField>
......
entity/WorkflowStartConfig_entity/imageProcess.js
+ 1
− 1
View file @ d88cc7f0
......@@ -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
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 9
− 0
View file @ d88cc7f0
......@@ -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>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 11
− 16
View file @ d88cc7f0
......@@ -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>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 11
− 0
View file @ d88cc7f0
......@@ -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>
neonView/OrderDetail_view/OrderDetail_view.aod
+ 1
− 1
View file @ d88cc7f0
<?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>
......
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