Skip to content
Snippets Groups Projects
Commit e869dae5 authored by Mohamed Mansour's avatar Mohamed Mansour
Browse files

merged master into Receipt

parents 9679bf23 f601c6e8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 86 additions and 318 deletions
.aditoprj/project.version
+ 1
− 1
View file @ e869dae5
#This file is generated by ADITO designer. Do NOT delete or modify!
#Wed Jul 17 13:06:20 CEST 2019
#Wed Jul 17 11:50:23 CEST 2019
version=5.1.19
.liquibase/Data_alias/basic/2019.1.4/Product_added_ImageBlobs.xml 0 → 100644
+ 10
− 0
View file @ e869dae5
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="j.hoermann" id="27dd5dea-94f2-47e6-88c3-5d5a50d781fa">
<addColumn tableName="PRODUCT">
<column name="PICTURE" type="LONGBLOB"/>
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+ 3
− 1
View file @ e869dae5
......@@ -177,13 +177,15 @@
<include relativeToChangelogFile="true" file="AditoBasic/create_ab_ctilog.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_CallDirection.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_CallAnswerMode.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_CallAnswerMode.xml"/>
<include relativeToChangelogFile="true" file="alter_appointmentlink.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_NotificationPriority.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_NotificationState.xml"/>
<include relativeToChangelogFile="true" file="Product_added_ImageBlobs.xml"/>
<include relativeToChangelogFile="true" file="Salesorder/create_ordertype_keyword.xml"/>
<include relativeToChangelogFile="true" file="Salesorder/create_dunninglevel_keyword.xml"/>
<include relativeToChangelogFile="true" file="Salesorder/update_Salesorder.xml"/>
......
aliasDefinition/Data_alias/Data_alias.aod
+ 14
− 278
View file @ e869dae5
......@@ -1835,6 +1835,20 @@
<title>Creation user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PICTURE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2004" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -10981,284 +10995,6 @@
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
<name>DUPLICATESCANCONDITIONCONFIG</name>
<dbName></dbName>
<idColumn>ID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
<title></title>
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
<auditMode v="0" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="91" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONDITION</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>COUNT_CHARACTERS_TO_USE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="91" />
<size v="10" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>ID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DUPLICATESCAN_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONDITION_CONFIG_NAME</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="200" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
<name>DUPLICATESCANNER</name>
<dbName></dbName>
<idColumn>ID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
<title></title>
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
<auditMode v="0" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="91" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>FILTER_NAME</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="200" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="91" />
<size v="10" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>ID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>ENTITY_TO_SCAN_NAME</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="200" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>EXTERNAL_SERVICE_USAGE_ALLOWED</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="16" />
<size v="1" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities>
</entityGroup>
</aliasDefDb>
......
entity/360Degree_entity/360Degree_entity.aod
+ 7
− 0
View file @ e869dae5
......@@ -3,6 +3,8 @@
<name>360Degree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>360 Degree</title>
<grantUpdate v="false" />
<grantDelete v="false" />
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
......@@ -134,6 +136,11 @@
<stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js</stateProcess>
<tooltip>Choose a campaign and a step to add the contact to a campaign</tooltip>
</entityActionField>
<entityActionField>
<name>newSupportticket</name>
<onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsupportticket/onActionProcess.js</onActionProcess>
<iconId>VAADIN:QUESTION</iconId>
</entityActionField>
</children>
</entityActionGroup>
<entityField>
......
entity/360Degree_entity/entityfields/newmodule/children/newsupportticket/onActionProcess.js 0 → 100644
+ 6
− 0
View file @ e869dae5
import("system.vars");
import("ActivityTask_lib");
import("Context_lib");
import("Ticket_lib")
TicketUtils.createNewTicket(undefined, [[vars.get("$param.BaseContextId_param"), vars.get("$param.ObjectRowId_param")]])
\ No newline at end of file
entity/ActivityLink_entity/ActivityLink_entity.aod
+ 0
− 1
View file @ e869dae5
......@@ -64,7 +64,6 @@
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</children>
</entityConsumer>
......
entity/Activity_entity/recordcontainers/db/onDBInsert.js 0 → 100644
+ 10
− 0
View file @ e869dae5
import("ActivityTask_lib");
import("system.vars");
import("system.db");
var documents = vars.exists("$param.PresetDocuments_param") && vars.getString("$param.PresetDocuments_param");
if (documents)
{
documents = JSON.parse(documents);
ActivityUtils.insertDocuments(vars.get("$field.ACTIVITYID"), documents);
}
\ No newline at end of file
entity/AddressValidation_entity/AddressValidation_entity.aod
+ 1
− 1
View file @ e869dae5
......@@ -48,7 +48,7 @@
</entityField>
<entityField>
<name>ZIP</name>
<title>Zip</title>
<title>Postcode</title>
</entityField>
<entityField>
<name>CITY</name>
......
entity/Address_entity/Address_entity.aod
+ 0
− 6
View file @ e869dae5
......@@ -241,12 +241,6 @@
<fieldName>PossibleAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>716aac15-99cb-4032-bf97-06101f0718f3</name>
<entityName>DSGVO_entity</entityName>
<fieldName>OrganisationAndContactAdresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/Address_entity/entityfields/address/mandatoryProcess.js
+ 5
− 5
View file @ e869dae5
import("Entity_lib");
import("system.result");
import("AddressEntity_lib");
result.object(AddressEntityValidation.isMandatoryField());
\ No newline at end of file
import("Entity_lib");
import("system.result");
import("AddressEntity_lib");
// TODO: fix validation, then remove comment.
// result.object(AddressEntityValidation.isMandatoryField());
\ No newline at end of file
entity/Address_entity/entityfields/city/mandatoryProcess.js
+ 6
− 5
View file @ e869dae5
import("Entity_lib");
import("system.result");
import("AddressEntity_lib");
result.object(AddressEntityValidation.isMandatoryField());
\ No newline at end of file
import("Entity_lib");
import("system.result");
import("AddressEntity_lib");
// TODO: fix validation, then remove comment.
// result.object(AddressEntityValidation.isMandatoryField());
\ No newline at end of file
entity/Address_entity/entityfields/state/mandatoryProcess.js
+ 6
− 5
View file @ e869dae5
import("Entity_lib");
import("system.result");
import("AddressEntity_lib");
result.object(AddressEntityValidation.isMandatoryField());
\ No newline at end of file
import("Entity_lib");
import("system.result");
import("AddressEntity_lib");
// TODO: fix validation, then remove comment.
// result.object(AddressEntityValidation.isMandatoryField());
\ No newline at end of file
entity/Address_entity/entityfields/zip/mandatoryProcess.js
+ 6
− 5
View file @ e869dae5
import("Entity_lib");
import("system.result");
import("AddressEntity_lib");
result.object(AddressEntityValidation.isMandatoryField());
\ No newline at end of file
import("Entity_lib");
import("system.result");
import("AddressEntity_lib");
// TODO: fix validation, then remove comment.
// result.object(AddressEntityValidation.isMandatoryField());
\ No newline at end of file
entity/AppointmentLink_entity/AppointmentLink_entity.aod
+ 0
− 1
View file @ e869dae5
......@@ -79,7 +79,6 @@
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</children>
</entityConsumer>
......
entity/Appointment_entity/Appointment_entity.aod
+ 2
− 1
View file @ e869dae5
......@@ -3,9 +3,10 @@
<name>Appointment_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
<title>Termin</title>
<title>Appointment</title>
<siblings />
<afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
<titlePlural>Appointments</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityField>
......
entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+ 5
− 5
View file @ e869dae5
......@@ -24,10 +24,10 @@ else if(vars.getString("$param.LinkedAppointmentsFromDashlet_param"))
{
var contactid = tools.getCurrentUser()["params"]["contactID"];
cond.andPrepareValue("AB_APPOINTMENTLINK.OBJECT_ROWID", contactid)
var idscond = db.translateCondition(cond.build("1 = 1"));
cond.andPrepareIfSet("AB_APPOINTMENTLINK.OBJECT_ROWID", contactid)
let idscond = db.translateCondition(cond.build("1 = 1"));
var appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
let appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
result.object(buildEntriesFromUids(appointmentUids));
}
......@@ -37,9 +37,9 @@ else if(vars.getString("$param.LinkedAppointmentsFromDashlet_param"))
else if(vars.getString("$param.LinkedObjectId_param") != undefined)
{
cond.andPrepareVars("AB_APPOINTMENTLINK.OBJECT_ROWID", "$param.LinkedObjectId_param")
var idscond = db.translateCondition(cond.build("1 = 1"));
let idscond = db.translateCondition(cond.build("1 = 1"));
var appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
let appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
result.object(buildEntriesFromUids(appointmentUids));
}
/**
......
entity/Appointment_entity/recordcontainers/jdito/onDelete.js
+ 1
− 1
View file @ e869dae5
......@@ -18,7 +18,7 @@ if (vars.exists("$param.Entry_param"))
* Deletes ApointmentLinks referring to the deleted Appointment.
*/
var cond = SqlCondition.begin();
cond.andPrepareValue("AB_APPOINTMENTLINK.APPOINTMENT_ID", entry[calendars.ID])
cond.andPrepareIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", entry[calendars.ID])
var idscond = db.translateCondition(cond.build("1 = 2"));
db.deleteData("AB_APPOINTMENTLINK", idscond);
......
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 1
− 0
View file @ e869dae5
......@@ -2,6 +2,7 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
<name>AttributeRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Attribute</title>
<grantDeleteProcess>%aditoprj%/entity/AttributeRelation_entity/grantDeleteProcess.js</grantDeleteProcess>
<titlePlural>Attributes</titlePlural>
<recordContainer>jdito</recordContainer>
......
entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js
+ 2
− 2
View file @ e869dae5
import("system.vars");
import("Attribute_lib");
var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
var objectType = vars.get("$field.OBJECT_TYPE");
var data = vars.get("$local.rowdata");
var objectType = data["OBJECT_TYPE.value"];
AttributeUsageUtil.deleteChildrenUsages(attributeId, objectType);
\ No newline at end of file
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