diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index e7ee7a89071990dc007a9a5c16bb45c32dd5229e..c5eb67d4cc64dee68f2c512fa2d3b0d8f98a1120 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Tue Apr 23 16:51:47 CEST 2019
-version=5.1.12
+#Fri May 03 10:13:46 CEST 2019
+version=5.1.13
diff --git a/.liquibase/Data_alias/basic/2019.2/AditoBasic/create_ab_loghistory.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/create_ab_loghistory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d7d65e6c6fc084edc1edd6173ce131458d314848
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/AditoBasic/create_ab_loghistory.xml
@@ -0,0 +1,19 @@
+<?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="m.kuhn" id="fbe17fba-5bf7-4203-8f6f-01723e07194c">
+ <createTable tableName="AB_LOGHISTORY">
+ <column name="USER_NEW" type="NVARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="DATE_NEW" type="DATETIME">
+ <constraints nullable="false"/>
+ </column>
+ <column name="DESCRIPTION" type="NCLOB"/>
+ <column name="LOGTYPE" type="CHAR(1)"/>
+ <column name="SOURCE_TABLENAME" type="NVARCHAR(30)"/>
+ <column name="SOURCE_TABLENAMEID" type="CHAR(36)"/>
+ <column name="TABLENAME" type="NVARCHAR(30)"/>
+ <column name="TABLENAMEID" type="CHAR(36)"/>
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 8bae6cc5fd00b3f90d0ecdb5647b4006a7bc7e47..8dd34b786f956712f56e4ea679dd6f83064fce90 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -140,9 +140,10 @@
<include relativeToChangelogFile="true" file="update_Milestone_to_new_Keyword.xml" />
<include relativeToChangelogFile="true" file="data/example_person/PERSON_admin.xml" context="example"/>
-
- <include relativeToChangelogFile="true" file="addDefaultAddresses.xml" context="example"/>
-
+
+ <include relativeToChangelogFile="true" file="addDefaultAddresses.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/create_ab_loghistory.xml"/>
+
<include relativeToChangelogFile="true" file="activity_rename_Creator_to_Responsible.xml" />
<include relativeToChangelogFile="true" file="miscellaneous/Contact_additionalColumns.xml" />
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
index 83818826decb7b62e72d42f34875cb823311b982..d045c99388757f245242ffd31e52d3fabcab6a9c 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
@@ -9,7 +9,7 @@
<column name="CAPTION" type="VARCHAR(512)"/>
<column name="CREATIONDATE" type="BIGINT"/>
<column name="DESCRIPTION" type="VARCHAR(1023)"/>
- <column name="FORCEDPRIORITY" type="INTEGER"/>
+ <column name="FORCEDPRIORITY" type="VARCHAR(15)"/>
<column name="ICON_INFO" type="VARCHAR(1023)"/>
<column name="LIFETIME" type="BIGINT"/>
<column name="LINK_INFO" type="VARCHAR(1023)"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 0e2aa0a90767faf3954e5aa1580a6774f4347103..3a15dc43ae202353202a8248a703c425427a9c1e 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -18,7 +18,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="2" />
+ <auditMode v="3" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -35,8 +35,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Customercode</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -48,8 +55,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Information</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>NAME</name>
@@ -61,8 +75,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Name</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TYPE</name>
@@ -74,8 +95,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESAREA</name>
@@ -87,8 +115,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Sales area</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ORGANISATIONID</name>
@@ -101,7 +136,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Organisation Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -115,7 +150,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -129,7 +164,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -143,7 +178,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -157,7 +192,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -171,8 +206,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Picture</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -203,8 +245,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Language</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/language/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACTID</name>
@@ -216,7 +270,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Contact Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -229,8 +283,22 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Company</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
+ <dependencies>
+ <entityDependency>
+ <name>c5479d2f-654d-4794-a61e-aee1f2c21673</name>
+ <entityName>ORGANISATION</entityName>
+ <fieldName>ORGANISATIONID</fieldName>
+ </entityDependency>
+ </dependencies>
</entityFieldDb>
<entityFieldDb>
<name>STATUS</name>
@@ -242,8 +310,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Status</title>
<description></description>
+ <customProperties>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>ContactStatus</property>
+ </customStringProperty>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PERSON_ID</name>
@@ -255,8 +335,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Contact</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ADDRESS_ID</name>
@@ -268,8 +355,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
- <title></title>
+ <title>standard address</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>RELATIONSHIP</name>
@@ -282,8 +376,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Relationship</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACTROLE</name>
@@ -296,8 +397,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Contactrole</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DEPARTMENT</name>
@@ -310,8 +418,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Department</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>POSITION</name>
@@ -324,8 +439,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Position Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -338,7 +460,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -352,7 +474,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -366,7 +488,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -380,7 +502,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -409,7 +531,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="2" />
+ <auditMode v="3" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -426,8 +548,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Title suffix</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PERSONID</name>
@@ -439,7 +568,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Person Id</title>
<description></description>
<dependencies>
<entityDependency>
@@ -459,8 +588,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Firstname</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>MIDDLENAME</name>
@@ -472,8 +608,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Middlename</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATEOFBIRTH</name>
@@ -485,8 +628,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Date of birth</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>LASTNAME</name>
@@ -498,8 +648,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Lastname</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALUTATION</name>
@@ -511,8 +668,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Salutation</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>GENDER</name>
@@ -524,8 +688,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Gender</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TITLE</name>
@@ -537,8 +708,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Title</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -551,7 +729,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -565,7 +743,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -579,7 +757,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -593,7 +771,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -607,8 +785,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Picture</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -639,8 +824,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>postcode</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STATE</name>
@@ -652,8 +844,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>${ADDRESS_STATE}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ADDR_TYPE</name>
@@ -665,8 +864,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Addresstype</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>REGION</name>
@@ -678,8 +884,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Region</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ADDRESSADDITION</name>
@@ -691,8 +904,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Address addition</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DISTRICT</name>
@@ -704,8 +924,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>District</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CITY</name>
@@ -717,8 +944,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>City</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>COUNTRY</name>
@@ -730,8 +964,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Country</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/address/entityfields/country/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ADDRESS</name>
@@ -743,8 +989,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Address</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ADDRESSID</name>
@@ -756,7 +1009,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Address Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -769,8 +1022,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>{$ADDRESS_IDENTIFIER}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
@@ -782,8 +1042,20 @@
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
- <title></title>
- <description></description>
+ <title>Contact Id</title>
+ <description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>tableRef</name>
+ <global v="false" />
+ <property>CONTACT</property>
+ </customStringProperty>
+ </customProperties>
<dependencies>
<entityDependency>
<name>b0a6bcf2-246e-475e-a4f0-b25553e1e27f</name>
@@ -802,8 +1074,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>House number</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -816,7 +1095,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -830,7 +1109,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -844,7 +1123,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -858,7 +1137,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation user</title>
<description></description>
</entityFieldDb>
</entityFields>
@@ -890,7 +1169,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Communication Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -903,8 +1182,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
- <title></title>
+ <title>Medium</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
@@ -916,8 +1202,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
- <title></title>
- <description></description>
+ <title>Contact Id</title>
+ <description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>tableRef</name>
+ <global v="false" />
+ <property>CONTACT</property>
+ </customStringProperty>
+ </customProperties>
<dependencies>
<entityDependency>
<name>c42dcb6e-6771-4fd0-80e8-86359c417051</name>
@@ -936,8 +1234,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Standard</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ADDR</name>
@@ -949,8 +1254,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>${COMM_ADDRESS}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -963,7 +1275,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -977,7 +1289,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -991,7 +1303,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -1005,7 +1317,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification user</title>
<description></description>
</entityFieldDb>
</entityFields>
@@ -1020,7 +1332,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -1037,8 +1349,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Next due date</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PAYMENT</name>
@@ -1050,8 +1369,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Payment method</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTSTATUS</name>
@@ -1063,8 +1389,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>${CONTRACT_STATUS}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTEND</name>
@@ -1076,8 +1409,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Contract expiry date</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTCODE</name>
@@ -1089,8 +1429,15 @@
<notNull v="true" />
<isUnique v="true" />
<index v="true" />
- <title></title>
+ <title>Contract number</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTID</name>
@@ -1102,7 +1449,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Contract Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -1115,8 +1462,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Type of contract</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
@@ -1128,8 +1482,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Connection</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTSTART</name>
@@ -1141,8 +1502,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Contract start date</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>REMARK</name>
@@ -1154,8 +1522,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Description</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -1169,7 +1544,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -1186,8 +1561,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Unit</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ADVERTISING</name>
@@ -1199,8 +1581,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Advertising material</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customBooleanProperty>
+ <name>autoMapTrueFalse4Log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCTID</name>
@@ -1212,7 +1606,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Product Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -1225,8 +1619,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Product name</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCTCODE</name>
@@ -1238,8 +1639,15 @@
<notNull v="true" />
<isUnique v="true" />
<index v="true" />
- <title></title>
+ <title>Product number</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>MINSTOCK</name>
@@ -1251,8 +1659,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Min. Stock</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>GROUPCODEID</name>
@@ -1264,8 +1679,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Product group</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STATUS</name>
@@ -1277,8 +1699,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Active</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customBooleanProperty>
+ <name>autoMapTrueFalse4Log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STANDARD</name>
@@ -1290,8 +1724,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Standard</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
@@ -1304,8 +1745,19 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Developer</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ </customStringProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -1318,8 +1770,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Description</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>LANGUAGE</name>
@@ -1332,8 +1791,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Language</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -1346,7 +1812,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -1360,7 +1826,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -1374,7 +1840,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -1388,7 +1854,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation user</title>
<description></description>
</entityFieldDb>
</entityFields>
@@ -1403,7 +1869,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -1420,8 +1886,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Optional</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TAKEPRICE</name>
@@ -1433,8 +1906,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Take price</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SOURCE_ID</name>
@@ -1446,8 +1926,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Product</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
<dependencies>
<entityDependency>
<name>da53ae25-5145-4772-83a3-5586534e9a98</name>
@@ -1466,8 +1953,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Quantity</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DEST_ID</name>
@@ -1479,8 +1973,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Destination Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
<dependencies>
<entityDependency>
<name>09534dc2-6385-4b33-bd5c-47a1e7d5e410</name>
@@ -1499,7 +2000,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Product relationship</title>
<description></description>
</entityFieldDb>
</entityFields>
@@ -1514,7 +2015,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -1531,8 +2032,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Currency</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRICE</name>
@@ -1544,8 +2052,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Price</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VAT</name>
@@ -1557,8 +2072,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>VAT in %</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRICELIST</name>
@@ -1570,8 +2092,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Price list</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>BUYSELL</name>
@@ -1583,8 +2112,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>PP/SP</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCT_ID</name>
@@ -1596,8 +2132,20 @@
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
- <title></title>
- <description></description>
+ <title>Product</title>
+ <description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>tableRef</name>
+ <global v="false" />
+ <property>PRODUCT</property>
+ </customStringProperty>
+ </customProperties>
<dependencies>
<entityDependency>
<name>639c107f-fbaf-49b2-bd21-292049cd2976</name>
@@ -1616,8 +2164,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Valid to</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>FROMQUANTITY</name>
@@ -1629,8 +2184,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>From no. of units</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
@@ -1642,8 +2204,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Company</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VALID_FROM</name>
@@ -1655,8 +2224,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Valid from</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCTPRICEID</name>
@@ -1668,7 +2244,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Product price Id</title>
<description></description>
</entityFieldDb>
</entityFields>
@@ -1683,7 +2259,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -1700,8 +2276,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Reference</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STOCKID</name>
@@ -1713,7 +2296,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Stock Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -1726,8 +2309,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Warehouse</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>QUANTITY</name>
@@ -1739,8 +2329,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Quantity</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ENTRYDATE</name>
@@ -1752,8 +2349,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Date</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCT_ID</name>
@@ -1765,8 +2369,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
- <title></title>
- <description></description>
+ <title>Product Id</title>
+ <description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
<dependencies>
<entityDependency>
<name>1d99d9fe-4956-4fd4-9f67-32b1c731dcc1</name>
@@ -1785,8 +2396,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>I / O</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -1800,7 +2418,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="3" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -1817,8 +2435,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>ISO 3166-1 alpha-3</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ISO2</name>
@@ -1830,7 +2455,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>ISO 3166-1 alpha-2</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -1844,8 +2469,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Address format</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>NAME_LATIN</name>
@@ -1858,8 +2490,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Latin Name</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>NAME_NATIVE</name>
@@ -1872,8 +2511,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Native Name</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>REQUIRED_FIELDS</name>
@@ -1886,8 +2532,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Required fields</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ZIP_REGEX</name>
@@ -1900,8 +2553,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>ZIP regex</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>FLAG</name>
@@ -1914,8 +2574,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Flag</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -1929,7 +2596,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -1946,8 +2613,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Currency</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>LANGUAGE</name>
@@ -1959,8 +2633,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Language</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/language/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VAT</name>
@@ -1972,8 +2658,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Total VAT</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OFFERDATE</name>
@@ -1985,8 +2683,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Offer date</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OFFERID</name>
@@ -1998,7 +2703,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Offer Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -2011,8 +2716,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Salesproject</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OFFERCODE</name>
@@ -2024,8 +2741,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Offer number</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PROBABILITY</name>
@@ -2037,8 +2761,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Probability</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STATUS</name>
@@ -2050,8 +2781,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Status</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>OfferStatus</property>
+ </customStringProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
@@ -2063,8 +2806,20 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Connection</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>NET</name>
@@ -2076,8 +2831,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Total net</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>HEADER</name>
@@ -2089,8 +2856,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Cover Letter</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OFFER_ID</name>
@@ -2103,8 +2877,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Offer Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VERSNR</name>
@@ -2117,8 +2898,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Vers. no.</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ADDRESS</name>
@@ -2131,8 +2919,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Address</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PAYMENTTERMS</name>
@@ -2145,8 +2940,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Payment term</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DELIVERYTERMS</name>
@@ -2159,8 +2961,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Deliveryspecification</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -2173,8 +2982,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Information</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -2187,7 +3003,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -2201,7 +3017,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -2215,7 +3031,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -2229,7 +3045,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation user</title>
<description></description>
</entityFieldDb>
</entityFields>
@@ -2244,7 +3060,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -2261,8 +3077,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Unit</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>QuantityUnit</property>
+ </customStringProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRICE</name>
@@ -2274,8 +3102,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Unit price</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>QUANTITY</name>
@@ -2287,8 +3122,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Quantity</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VAT</name>
@@ -2300,8 +3142,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>VAT in %</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OFFER_ID</name>
@@ -2313,8 +3162,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Offer Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="false" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>tableRef</name>
+ <global v="false" />
+ <property>OFFER</property>
+ </customStringProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OFFERITEMID</name>
@@ -2326,7 +3187,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Offer item Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -2339,8 +3200,15 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Article</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DISCOUNT</name>
@@ -2352,8 +3220,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Discount %</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ITEMPOSITION</name>
@@ -2365,8 +3240,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Position</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OPTIONAL</name>
@@ -2378,8 +3260,20 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Optional</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customBooleanProperty>
+ <name>autoMapTrueFalse4Log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>GROUPCODEID</name>
@@ -2391,8 +3285,20 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Commodity group</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>ProductGroupcode</property>
+ </customStringProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ITEMSORT</name>
@@ -2404,8 +3310,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Item sort</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ASSIGNEDTO</name>
@@ -2417,8 +3330,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
- <title></title>
+ <title>Assigned to</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="false" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ITEMNAME</name>
@@ -2430,8 +3350,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Designation</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -2444,8 +3371,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Description</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -2459,7 +3393,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -2476,8 +3410,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Project start</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VOLUME</name>
@@ -2489,8 +3430,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Volume</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -2502,8 +3450,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Information</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ENDDATE</name>
@@ -2515,8 +3470,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Rollout</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PHASE</name>
@@ -2528,8 +3490,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Phase</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PROJECTCODE</name>
@@ -2541,8 +3510,15 @@
<notNull v="true" />
<isUnique v="true" />
<index v="true" />
- <title></title>
+ <title>Project number</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESPROJECTID</name>
@@ -2554,7 +3530,7 @@
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
- <title></title>
+ <title>Salesproject Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -2567,8 +3543,20 @@
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Company</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PROJECTTITLE</name>
@@ -2580,8 +3568,15 @@
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
- <title></title>
+ <title>Project title</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PROBABILITY</name>
@@ -2594,8 +3589,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Probability</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STATE</name>
@@ -2608,8 +3610,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Status</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>REASONS</name>
@@ -2622,8 +3631,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Reason</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -2637,7 +3653,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -2655,7 +3671,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject source Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -2669,8 +3685,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Touchpoint</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ENTRYDATE</name>
@@ -2683,8 +3706,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Entry date</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -2697,8 +3727,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Info</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESPROJECT_ID</name>
@@ -2711,8 +3748,20 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>tableRef</name>
+ <global v="false" />
+ <property>SALESPROJECT</property>
+ </customStringProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -2726,7 +3775,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -2744,7 +3793,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject forecast Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -2758,8 +3807,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Product</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VOLUME</name>
@@ -2772,8 +3828,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Volume</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_START</name>
@@ -2786,8 +3849,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Date start</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -2800,8 +3870,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Info</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESPROJECT_ID</name>
@@ -2814,8 +3891,20 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>tableRef</name>
+ <global v="false" />
+ <property>SALESPROJECT</property>
+ </customStringProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TYPE</name>
@@ -2828,8 +3917,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -2843,7 +3939,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -2861,8 +3957,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>State</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -2875,8 +3978,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Info</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>REASON</name>
@@ -2889,8 +3999,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Reason</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_CANCELLED</name>
@@ -2903,8 +4020,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Excreted</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESPROJECT_COMPETITIONID</name>
@@ -2917,7 +4041,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject competition Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -2931,8 +4055,20 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>tableRef</name>
+ <global v="false" />
+ <property>SALESPROJECT</property>
+ </customStringProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
@@ -2945,8 +4081,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Company</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PHASE</name>
@@ -2959,8 +4102,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Phase</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -2974,7 +4124,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -2992,7 +4142,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject member Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -3006,8 +4156,20 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Person</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject_member/entityfields/contact_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESPROJECT_ROLE</name>
@@ -3020,8 +4182,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Role</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESPROJECT_ID</name>
@@ -3034,8 +4203,20 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>tableRef</name>
+ <global v="false" />
+ <property>SALESPROJECT</property>
+ </customStringProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>RELATIONSHIP</name>
@@ -3048,8 +4229,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Relationship</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -3063,7 +4251,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -3081,7 +4269,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject classification Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -3095,8 +4283,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Class</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VALUE</name>
@@ -3109,8 +4304,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Value</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESPROJECT_ID</name>
@@ -3123,8 +4325,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TYPE</name>
@@ -3137,8 +4346,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -3152,7 +4368,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -3170,8 +4386,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Date</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TIMETRACKINGID</name>
@@ -3184,7 +4407,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Timetracking Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -3198,8 +4421,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Object Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>MINUTES</name>
@@ -3212,8 +4442,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Time</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
@@ -3226,8 +4463,15 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Creator</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -3240,8 +4484,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Description</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ROW_ID</name>
@@ -3254,8 +4505,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Connection</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -3269,7 +4527,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -3287,8 +4545,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Direction</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SUBJECT</name>
@@ -3301,8 +4566,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Subject</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ENTRYDATE</name>
@@ -3315,8 +4587,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Entry date</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -3329,8 +4608,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Description</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ACTIVITYID</name>
@@ -3343,7 +4629,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Activity Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -3357,8 +4643,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Category</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PARENT_CONTEXT</name>
@@ -3371,8 +4664,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Parent context</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PARENT_ID</name>
@@ -3385,8 +4685,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Parent Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -3399,7 +4706,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -3413,7 +4720,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -3427,7 +4734,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -3441,7 +4748,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -3455,8 +4762,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Responsible</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -3470,7 +4784,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -3488,8 +4802,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Currency</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>LANGUAGE</name>
@@ -3502,8 +4823,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Language</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VERSNR</name>
@@ -3516,8 +4844,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Version number</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VAT</name>
@@ -3530,8 +4865,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>VAT</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>FOOTER</name>
@@ -3544,8 +4886,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Footer text</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>HEADER</name>
@@ -3558,8 +4907,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Header text</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESORDERCODE</name>
@@ -3572,8 +4928,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesorder code</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESPROJECT_ID</name>
@@ -3586,8 +4949,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STATUS</name>
@@ -3600,8 +4970,20 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Status</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>keyword</name>
+ <global v="false" />
+ <property>SalesorderState</property>
+ </customStringProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESORDERDATE</name>
@@ -3614,8 +4996,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesorder date</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESORDER_ID</name>
@@ -3628,8 +5017,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesorder Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
@@ -3642,8 +5038,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Connection</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>NET</name>
@@ -3656,8 +5059,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Total net</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESORDERID</name>
@@ -3670,7 +5080,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesorder Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -3684,8 +5094,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Address</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OFFER_ID</name>
@@ -3698,8 +5115,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Offer</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -3713,7 +5137,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -3731,8 +5155,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Unit</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRICE</name>
@@ -3745,8 +5176,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Unit Price</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>QUANTITY</name>
@@ -3759,8 +5197,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Quantity</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VAT</name>
@@ -3773,8 +5218,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>VAT in %</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCT_ID</name>
@@ -3787,8 +5239,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Article</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DISCOUNT</name>
@@ -3801,8 +5260,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Discount</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ITEMPOSITION</name>
@@ -3815,8 +5281,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Position</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OPTIONAL</name>
@@ -3829,8 +5302,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Optional</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>GROUPCODEID</name>
@@ -3843,8 +5323,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Commodity group</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ITEMSORT</name>
@@ -3857,8 +5344,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Item sort</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESORDER_ID</name>
@@ -3871,8 +5365,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesorder Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ASSIGNEDTO</name>
@@ -3885,8 +5386,15 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Assigned to</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESORDERITEMID</name>
@@ -3899,7 +5407,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesorder item Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -3913,8 +5421,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Designation</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -3927,8 +5442,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Description</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -3942,7 +5464,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -3960,8 +5482,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>priority</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>MATURITY_DATE</name>
@@ -3974,8 +5503,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Maturity</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>EDITOR_CONTACT_ID</name>
@@ -3988,8 +5524,15 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>{$TASK_EDITOR}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TASKID</name>
@@ -4002,7 +5545,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Task Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4016,8 +5559,15 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>task number</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STATUS</name>
@@ -4030,8 +5580,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>{$TASK_STATUS}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DESCRIPTION</name>
@@ -4044,8 +5601,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Description</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>REQUESTOR_CONTACT_ID</name>
@@ -4058,8 +5622,15 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>{$TASK_REQUESTOR}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SUBJECT</name>
@@ -4072,8 +5643,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>subject</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PROTECTIONLEVEL</name>
@@ -4086,8 +5664,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Protection level</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>START_DATE</name>
@@ -4100,8 +5685,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Start date</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TYPE</name>
@@ -4114,8 +5706,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PARENT_ID</name>
@@ -4128,8 +5727,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Parent Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PARENT_CONTEXT</name>
@@ -4142,8 +5748,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Parent context</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PROGRESS</name>
@@ -4156,8 +5769,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Progress</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -4171,7 +5791,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -4189,8 +5809,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Object 2 row Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT1_ROWID</name>
@@ -4203,8 +5830,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Object 1 row Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AB_OBJECTRELATIONID</name>
@@ -4217,7 +5851,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Object relation</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4231,8 +5865,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Object relation type 1</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AB_OBJECTRELATIONTYPE2</name>
@@ -4245,8 +5886,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Object relation type 2</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
@@ -4259,8 +5907,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Info</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -4274,7 +5929,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -4292,7 +5947,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Attribute usage Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4306,8 +5961,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Attribute Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT_TYPE</name>
@@ -4320,8 +5982,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Module</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>MIN_COUNT</name>
@@ -4334,8 +6003,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Minimal count</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>MAX_COUNT</name>
@@ -4348,8 +6024,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Maximal count</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -4363,7 +6046,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -4381,8 +6064,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Name</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ATTRIBUTE_TYPE</name>
@@ -4395,8 +6085,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AB_ATTRIBUTEID</name>
@@ -4409,7 +6106,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Attribute Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4423,8 +6120,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Active</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ATTRIBUTE_PARENT_ID</name>
@@ -4437,8 +6141,15 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Superordinate Attribute</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>KEYWORD_CONTAINER</name>
@@ -4451,8 +6162,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Keyword</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SORTING</name>
@@ -4465,8 +6183,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Sorting</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ATTRIBUTE_INFO</name>
@@ -4479,8 +6204,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Description</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -4494,7 +6226,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -4512,8 +6244,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Object row Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_VALUE</name>
@@ -4526,8 +6265,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Date value</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>NUMBER_VALUE</name>
@@ -4540,8 +6286,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Number value</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AB_ATTRIBUTERELATIONID</name>
@@ -4554,7 +6307,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Attribute relation Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4568,8 +6321,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Object type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CHAR_VALUE</name>
@@ -4582,8 +6342,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Char value</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AB_ATTRIBUTE_ID</name>
@@ -4596,8 +6363,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Attribute</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ID_VALUE</name>
@@ -4610,8 +6384,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Id value</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -4624,7 +6405,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4638,7 +6419,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4652,7 +6433,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4666,7 +6447,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4680,8 +6461,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Int value</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -4695,7 +6483,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -4713,8 +6501,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>{$OBJECTLINK_OBJECT}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ACTIVITYLINKID</name>
@@ -4727,7 +6522,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Activity link Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4741,8 +6536,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Activity Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT_TYPE</name>
@@ -4755,8 +6557,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>{$OBJECTLINK_TYPE}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -4769,7 +6578,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4783,7 +6592,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation date</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4797,7 +6606,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Creation user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -4811,7 +6620,7 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Modification user</title>
<description></description>
</entityFieldDb>
</entityFields>
@@ -4826,7 +6635,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -4844,8 +6653,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Relational</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTAINER</name>
@@ -4858,8 +6674,15 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Container</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SORTING</name>
@@ -4872,8 +6695,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Sorting</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TITLE</name>
@@ -4886,8 +6716,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Title</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>KEYID</name>
@@ -4900,8 +6737,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Key</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ISACTIVE</name>
@@ -4914,8 +6758,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Active</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AB_KEYWORD_ENTRYID</name>
@@ -4928,7 +6779,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Keyword entry Id</title>
<description></description>
</entityFieldDb>
</entityFields>
@@ -4943,7 +6794,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -4961,8 +6812,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Name latin</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>NAME_NATIVE</name>
@@ -4975,8 +6833,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Name native</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ISO3</name>
@@ -4989,7 +6854,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>ISO3</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -5003,8 +6868,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Is active</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ISO2</name>
@@ -5017,8 +6889,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>ISO2</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -5050,7 +6929,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Keyword attribute Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -5064,8 +6943,15 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Container</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TYPE</name>
@@ -5078,8 +6964,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>NAME</name>
@@ -5092,8 +6985,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Name</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -5107,7 +7007,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -5125,8 +7025,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>CHAR VALUE</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>BOOL_VALUE</name>
@@ -5139,8 +7046,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>BOOL VALUE</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AB_KEYWORD_ATTRIBUTERELATIONID</name>
@@ -5153,7 +7067,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Keyword attribute relation Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -5167,8 +7081,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>NUMBER VALUE</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AB_KEYWORD_ENTRY_ID</name>
@@ -5181,8 +7102,15 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Keyword entry Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AB_KEYWORD_ATTRIBUTE_ID</name>
@@ -5195,8 +7123,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Keyword Attribute</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -5210,7 +7145,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -5228,8 +7163,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>{$OBJECTLINK_OBJECT}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AB_APPOINTMENTLINK_ID</name>
@@ -5242,7 +7184,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Appointment link Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -5256,8 +7198,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Appointment Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT_TYPE</name>
@@ -5270,8 +7219,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>{$OBJECTLINK_TYPE}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -5286,7 +7242,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -5304,8 +7260,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>{$OBJECTLINK_OBJECT}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT_TYPE</name>
@@ -5318,8 +7281,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>{$OBJECTLINK_TYPE}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TASKLINKID</name>
@@ -5332,7 +7302,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Task link Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -5346,8 +7316,15 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
- <title></title>
+ <title>Task Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -5362,7 +7339,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -5380,7 +7357,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Object Relation Type</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -5394,8 +7371,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Side</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_TYPE</name>
@@ -5408,8 +7392,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Relation Type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT_TYPE</name>
@@ -5422,8 +7413,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Object Type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_TITLE</name>
@@ -5436,8 +7434,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Relation Title</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>HIERARCHY</name>
@@ -5450,8 +7455,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Hierarchy</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -5466,7 +7478,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -5484,8 +7496,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Language</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALUTATION</name>
@@ -5498,8 +7517,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salutation</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SEX</name>
@@ -5512,8 +7538,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Sex</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SORT</name>
@@ -5526,8 +7559,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Sort</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALUTATIONID</name>
@@ -5540,7 +7580,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salutation Id</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
@@ -5554,8 +7594,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Title</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>HEADLINE</name>
@@ -5568,8 +7615,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Headline</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>LETTERSALUTATION</name>
@@ -5582,8 +7636,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Letter salutation</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -5598,7 +7659,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -5616,8 +7677,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Exec type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATEEXECUTED</name>
@@ -5630,8 +7698,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Data executed</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ORDEREXECUTED</name>
@@ -5644,8 +7719,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Order executed</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>COMMENTS</name>
@@ -5658,8 +7740,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Comments</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>AUTHOR</name>
@@ -5672,8 +7761,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Author</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTEXTS</name>
@@ -5686,8 +7782,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Contexts</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>MD5SUM</name>
@@ -5700,8 +7803,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>MD5 Sum</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DESCRIPTION</name>
@@ -5714,8 +7824,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Desciption</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>LIQUIBASE</name>
@@ -5728,8 +7845,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Liquibase</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DEPLOYMENT_ID</name>
@@ -5742,8 +7866,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Deployment Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ID</name>
@@ -5756,8 +7887,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TAG</name>
@@ -5770,8 +7908,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Tag</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>LABELS</name>
@@ -5784,8 +7929,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Labels</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>FILENAME</name>
@@ -5798,8 +7950,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Filename</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
@@ -5814,7 +7973,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -5832,8 +7991,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Lock granted</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>LOCKED</name>
@@ -5846,8 +8012,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Locked</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>LOCKEDBY</name>
@@ -5860,8 +8033,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Locked by</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ID</name>
@@ -5874,6 +8054,138 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
+ <title>Id</title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>AB_LOGHISTORY</name>
+ <dbName></dbName>
+ <idColumn>AB_LOGHISTORYID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="2" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>TABLENAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="30" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title>Tablename</title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DESCRIPTION</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>Description</title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SOURCE_TABLENAMEID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title>Source tablename Id</title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>LOGTYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="1" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title>Log type</title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SOURCE_TABLENAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="30" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title>Source tablename</title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TABLENAMEID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title>Tablename Id</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>Creation user</title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
@@ -5890,7 +8202,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -5908,8 +8220,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Date start</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>VALUE</name>
@@ -5922,8 +8241,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Value</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESPROJECT_ID</name>
@@ -5936,8 +8262,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject Id</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TYPE</name>
@@ -5950,8 +8283,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Type</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_END</name>
@@ -5964,8 +8304,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Date end</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SALESPROJECT_MILESTONEID</name>
@@ -5978,7 +8325,7 @@
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Salesproject milestone Id</title>
<description></description>
</entityFieldDb>
</entityFields>
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/address/entityfields/country/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/address/entityfields/country/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..3951889f460b2c87e5a592e7241d8aa1e2656033
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/address/entityfields/country/customproperties/translate4log/property.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Country_lib");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var countryName = CountryUtils.getLatinNameByIso2(params.value, params.locale);
+result.string(countryName);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/language/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/language/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..51a8cec57a7a635681f7c183f2fe3c369db8f692
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/language/customproperties/translate4log/property.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Loghistory_lib");
+import("Keyword_lib");
+
+var params = Translate4LogParams.load();
+var res = LanguageKeywordUtils.getViewValue(params.value, params.locale);
+result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..f35d37ab09f059046b3b6f3d672cf01c66fe58c4
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
@@ -0,0 +1,7 @@
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
+result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/language/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/language/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..51a8cec57a7a635681f7c183f2fe3c369db8f692
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/language/customproperties/translate4log/property.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Loghistory_lib");
+import("Keyword_lib");
+
+var params = Translate4LogParams.load();
+var res = LanguageKeywordUtils.getViewValue(params.value, params.locale);
+result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5d36c467b8589e884de0ca28daa71f36b9cb894
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+result.string(text.formatDouble(params.value, translate.text("#,##0.00", params.locale)));
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..e6c0e291bce1ba0d265e5577c4d8ad43ebdd6751
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.db");
+import("Sql_lib");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+
+var res = db.cell(SqlCondition.begin()
+ .andPrepare("SALESPROJECT.SALESPROJECTID", params.value)
+ .buildSql("select PROJECTTITLE from SALESPROJECT"));
+result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5d36c467b8589e884de0ca28daa71f36b9cb894
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+result.string(text.formatDouble(params.value, translate.text("#,##0.00", params.locale)));
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f7c5917a2317799200776b01469d749759bd6bb
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
@@ -0,0 +1,8 @@
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..013c797ac6b08eb3d113c1bb045c0e12cbc51558
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
@@ -0,0 +1,8 @@
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject_member/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject_member/entityfields/contact_id/customproperties/translate4log/property.js
new file mode 100644
index 0000000000000000000000000000000000000000..f35d37ab09f059046b3b6f3d672cf01c66fe58c4
--- /dev/null
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject_member/entityfields/contact_id/customproperties/translate4log/property.js
@@ -0,0 +1,7 @@
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
+result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index fe31c1a18fccfec5e5c6ed30cfe33b2fe3fcd9ae..a78014b1d0cd10eb39a6f9667ad3a8347db650d0 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -1445,19 +1445,6 @@
<name>auditSyncConfig</name>
</auditSyncConfig>
<entityFields>
- <entityFieldDb>
- <name>ACOLUMNNAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>ALIAS</name>
<dbName></dbName>
@@ -1614,6 +1601,34 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>AOCOLUMNNAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="127" />
+ <scale v="0" />
+ <notNull v="false" />
+ <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>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 8684c41b4dc28464f39b2cf582c98b4ab0db3e4a..a95553752f7af536128e2f0cf77b5cf33590308d 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>360Degree_entity</name>
- <title>360 Degree</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>360 Degree</title>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 6754d250358a61f442f51e8827f23bc2b41f06f5..361a702af0639b172ac1fb90d976cf9f2569518a 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>ActivityLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Connection</title>
+ <titlePlural>Connections</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 2d5bca66aa99064f9f89fc16d218c48649c3248c..91c28b50503be00efa3391d88f82465fd0ac7bb7 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Activity_entity</name>
- <title>Activity</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
+ <title>Activity</title>
<afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
<iconId>NEON:HISTORY</iconId>
<image>VAADIN:SHOP</image>
<imageProcess>%aditoprj%/entity/Activity_entity/imageProcess.js</imageProcess>
+ <titlePlural>Activities</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -93,7 +94,6 @@
</entityParameter>
<entityConsumer>
<name>Documents</name>
- <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -117,7 +117,6 @@
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
- <title>Maindocuments</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
@@ -154,7 +153,6 @@
</entityField>
<entityConsumer>
<name>Links</name>
- <title>Connections</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -284,7 +282,6 @@
</entityField>
<entityConsumer>
<name>ModuleTrees</name>
- <title>History</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -367,12 +364,11 @@
</entityField>
<entityConsumer>
<name>Attributes</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -410,11 +406,10 @@
</entityParameter>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index ea37c1bada3dbf24b3e35474b04a9b0a4116d5c0..e6560349682d405c4578e94c3fe8dfff6dadfa6f 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>AddressType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/AddressType_entity/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/AddressType_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/AddressType_entity/titleProcess.js b/entity/AddressType_entity/contentTitleProcess.js
similarity index 100%
rename from entity/AddressType_entity/titleProcess.js
rename to entity/AddressType_entity/contentTitleProcess.js
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index 88ae4f57a7834d66fe2c8276150c2df00afb0d4d..ad1e2f86a85ee55cc537b23ad93471aa266b28e8 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>AddressValidation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/AddressValidation_entity/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/AddressValidation_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/AddressValidation_entity/titleProcess.js b/entity/AddressValidation_entity/contentTitleProcess.js
similarity index 100%
rename from entity/AddressValidation_entity/titleProcess.js
rename to entity/AddressValidation_entity/contentTitleProcess.js
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index c43a760ab0121755f0962f11c6031b175c1f1c6c..a64fc0449a59c31d783e2f0003b08f18a31199c1 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Address_entity</name>
- <title>Addresses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
- <titleProcess>%aditoprj%/entity/Address_entity/titleProcess.js</titleProcess>
+ <title>Addresses</title>
+ <contentTitleProcess>%aditoprj%/entity/Address_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -176,6 +176,7 @@
<name>OrganisationAddressesByContact</name>
<fieldType>DEPENDENCY_IN</fieldType>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
+ <titlePlural>Company Addresses</titlePlural>
<dependencies>
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
diff --git a/entity/Address_entity/titleProcess.js b/entity/Address_entity/contentTitleProcess.js
similarity index 100%
rename from entity/Address_entity/titleProcess.js
rename to entity/Address_entity/contentTitleProcess.js
diff --git a/entity/Address_entity/entityfields/country/displayValueProcess.js b/entity/Address_entity/entityfields/country/displayValueProcess.js
index 22c043fdc3d9ab8fbe1e9b67738a0f105ce7aaee..3eb96b525814164e667c8f223eea3be8de1da0ec 100644
--- a/entity/Address_entity/entityfields/country/displayValueProcess.js
+++ b/entity/Address_entity/entityfields/country/displayValueProcess.js
@@ -1,11 +1,8 @@
import("system.vars");
-import("system.db");
-import("system.translate");
import("system.result");
-import("Sql_lib");
+import("Country_lib");
//TODO: temporary testing code -> will be replaced with title-mechanic
var isoCode = vars.get("$field.COUNTRY");
-var countryName = db.cell(SqlCondition.begin().andPrepare("AB_COUNTRYINFO.ISO2", isoCode).buildSql("select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO"));
-countryName = translate.text(countryName);
+var countryName = CountryUtils.getLatinNameByIso2(isoCode);
result.string(countryName);
\ No newline at end of file
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 7bd0ae099d0a290f631fa2670f80ddce773daeb4..36a38ffeedd63b3fa5961a75d30b0699ef0e0604 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Analyses_entity</name>
- <title>Analyses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:GRID_BIG_O</icon>
+ <title>Analyses</title>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index bb167ee03350083aef1ea9caba4749f1347fc951..1a96d80a3c880c59b1bdc0cf7173dcedbeef1c3d 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>AnyContact_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/AnyContact_entity/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/AnyContact_entity/titleProcess.js b/entity/AnyContact_entity/contentTitleProcess.js
similarity index 100%
rename from entity/AnyContact_entity/titleProcess.js
rename to entity/AnyContact_entity/contentTitleProcess.js
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 29347ffaa4454728cafcf204d8c836bc0e84e14c..f4e98be9e35885a77081d5b03ce248bbd38cdaeb 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>AppointmentLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>db</recordContainer>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 5f8717198f77a83891a85167fc6f39e63aff18b6..d4a152b555b3c56ab893a7c308403e06d1209021 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Appointment_entity</name>
- <title>Termin</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
+ <title>Termin</title>
<afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
<recordContainer>jdito</recordContainer>
<entityFields>
diff --git a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
deleted file mode 100644
index b0c1cc1dc3b026692007e5bac012f544d0906f30..0000000000000000000000000000000000000000
--- a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
- <name>AttributeRelationTree_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>PARENT_ID</name>
- </entityField>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>TreeProvider</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
- <entityName>Person_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
- <entityName>Product_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
- <entityName>Activity_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d6d5f9aa-4582-4ec5-9381-394a38a726e8</name>
- <entityName>Offer_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
- <entityName>Contract_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3921c712-d15c-4941-b04d-44f4536dc404</name>
- <entityName>Employee_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>148faad1-78f6-4ff2-a4d5-9607d919adb9</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8ed8bae6-c69e-45ce-9fc9-5fb43587a47b</name>
- <entityName>Order_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>AB_ATTRIBUTE_ID</name>
- <title>Attribute</title>
- <consumer>SpecificAttribute</consumer>
- <onValueChange>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/ab_attribute_id/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>VALUE</name>
- <title>Value</title>
- <contentTypeProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/value/contentTypeProcess.js</contentTypeProcess>
- <resolution>DAY</resolution>
- <mandatoryProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/value/mandatoryProcess.js</mandatoryProcess>
- <dropDownProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/value/dropDownProcess.js</dropDownProcess>
- <stateProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/value/stateProcess.js</stateProcess>
- </entityField>
- <entityConsumer>
- <name>SpecificAttribute</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>AttributeCount_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionGroup>
- <name>alter</name>
- <children>
- <entityActionField>
- <name>edit</name>
- <fieldType>ACTION</fieldType>
- <onActionProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
- <iconId>NEON:PENCIL</iconId>
- <stateProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>PARENT_ID.value</element>
- <element>VALUE.value</element>
- <element>VALUE.displayValue</element>
- <element>AB_ATTRIBUTE_ID.value</element>
- <element>AB_ATTRIBUTE_ID.displayValue</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/AttributeRelationTree_entity/entityfields/ab_attribute_id/onValueChange.js b/entity/AttributeRelationTree_entity/entityfields/ab_attribute_id/onValueChange.js
deleted file mode 100644
index 1cebe1b3feaf01b51d151221f833a7255541bfb5..0000000000000000000000000000000000000000
--- a/entity/AttributeRelationTree_entity/entityfields/ab_attribute_id/onValueChange.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
- vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- neon.setFieldValue("$field.VALUE", null);
-}
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js b/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 5c2ba1e99bd66da1cbc065319b7644302880879f..0000000000000000000000000000000000000000
--- a/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.exists("$param.ObjectType_param") ? vars.get("$param.ObjectType_param") : "");
diff --git a/entity/AttributeRelationTree_entity/entityfields/value/contentTypeProcess.js b/entity/AttributeRelationTree_entity/entityfields/value/contentTypeProcess.js
deleted file mode 100644
index e692170633914456e09edf154860eb0a1f6842ef..0000000000000000000000000000000000000000
--- a/entity/AttributeRelationTree_entity/entityfields/value/contentTypeProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
-result.string(AttributeTypeUtil.getContentType(attributeType));
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onDelete.js b/entity/AttributeRelationTree_entity/recordcontainers/jdito/onDelete.js
deleted file mode 100644
index 219317e107752606f09b507bbdd68e17a018af4c..0000000000000000000000000000000000000000
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onDelete.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-import("system.db");
-
-if (vars.get("$field.AB_ATTRIBUTE_ID"))
-{
- db.deleteData("AB_ATTRIBUTERELATION", SqlCondition.begin().andPrepareVars("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", "$field.UID").build("1=2"));
- neon.refresh();
-}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index eaec031a3da11d316e6069b3013480b86e5cd69d..170faced7b52435b3091309bd4a5bf31c7113e77 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,296 +1,268 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>AttributeRelation_entity</name>
- <title>Attribute Relation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/AttributeRelation_entity/documentation.adoc</documentation>
- <recordContainer>db</recordContainer>
+ <title>Attribute</title>
+ <titlePlural>Attributes</titlePlural>
+ <recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
- <name>AB_ATTRIBUTERELATIONID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attributerelationid/valueProcess.js</valueProcess>
+ <name>PARENT_ID</name>
</entityField>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>TreeProvider</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>d6d5f9aa-4582-4ec5-9381-394a38a726e8</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3921c712-d15c-4941-b04d-44f4536dc404</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>148faad1-78f6-4ff2-a4d5-9607d919adb9</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8ed8bae6-c69e-45ce-9fc9-5fb43587a47b</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>GetTree_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
<entityField>
<name>AB_ATTRIBUTE_ID</name>
<title>Attribute</title>
<consumer>SpecificAttribute</consumer>
- <mandatory v="false" />
- <groupable v="true" />
<displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes />
</entityField>
<entityField>
- <name>OBJECT_ROWID</name>
- <mandatory v="true" />
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_TYPE</name>
- <mandatory v="true" />
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>valueProxy</name>
+ <name>VALUE</name>
<title>Value</title>
- <contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
+ <contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js</contentTypeProcess>
<resolution>DAY</resolution>
- <mandatory v="false" />
- <mandatoryProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/mandatoryProcess.js</mandatoryProcess>
- <dropDownProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/dropDownProcess.js</dropDownProcess>
- <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>CHAR_VALUE</name>
- <mandatory v="false" />
- <searchable v="false" />
+ <mandatoryProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/mandatoryProcess.js</mandatoryProcess>
+ <dropDownProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js</dropDownProcess>
+ <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityConsumer>
+ <name>SpecificAttribute</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeCount_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionGroup>
+ <name>alter</name>
+ <children>
+ <entityActionField>
+ <name>edit</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
+ <iconId>NEON:PENCIL</iconId>
+ <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityParameter>
+ <name>GetTree_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
<entityProvider>
- <name>RelationsForSpecificObject</name>
+ <name>AttributeRelations</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
- <name>c0905809-29bd-47bd-a8d2-ee09dd0c9f75</name>
+ <name>69560cc2-d92a-453c-9e64-fb712a538c4f</name>
<entityName>Organisation_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>236a52d8-830d-4e46-bf9b-7ffaeef25477</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>AttributeChildren</fieldName>
+ <name>34f24d10-7312-4b03-8d6f-2918c8cb9eb8</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>21de4424-d5e2-4c19-a5e1-1f59dbc186b3</name>
- <entityName>Contract_entity</entityName>
+ <name>3cb1014d-a6c8-4b4a-83ba-a099d4488ab2</name>
+ <entityName>Activity_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>5bcda86a-e56c-4a4a-ac13-c6eb68152200</name>
- <entityName>Product_entity</entityName>
+ <name>2662f513-6498-40c2-bed6-031087857e82</name>
+ <entityName>Contract_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>a9b81050-e7f8-408d-aa73-e2709188e121</name>
- <entityName>SalesprojectCompetition_entity</entityName>
+ <name>be336d6c-c550-4ae5-9f78-0f2ee56a2a6c</name>
+ <entityName>Employee_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>f73a57f2-0697-4ebf-abc1-a7eb24d89fe4</name>
- <entityName>Activity_entity</entityName>
+ <name>8488da81-0f98-4c4b-811f-ccda64c8624b</name>
+ <entityName>Offer_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>e5a7ee8b-67da-4a5d-a0cf-09a9f85016eb</name>
- <entityName>Offer_entity</entityName>
+ <name>7df4a57a-646d-4b5a-802b-f1e2bf93d09b</name>
+ <entityName>Order_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>cb20be7b-35aa-43c7-bf98-3a31010b33d6</name>
- <entityName>Employee_entity</entityName>
+ <name>40a4c698-d34f-4c5a-bee8-239ee9d71f20</name>
+ <entityName>Product_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>6e01a982-198c-40ab-ae1b-7f5683d33f07</name>
+ <name>99bc7ec8-195e-483f-923e-763c6f28a29c</name>
<entityName>Salesproject_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>1d33f00a-203d-4119-9178-c7dc0d087353</name>
- <entityName>Order_entity</entityName>
+ <name>9d2f08b1-065c-45c3-9922-a5fc443684e8</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>GetTree_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
<entityField>
- <name>DATE_VALUE</name>
- <contentType>DATE</contentType>
- <searchable v="false" />
- <state>EDITABLE</state>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>NUMBER_VALUE</name>
- <contentType>NUMBER</contentType>
- <searchable v="false" />
- <state>EDITABLE</state>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
<entityField>
- <name>INT_VALUE</name>
- <contentType>BOOLEAN</contentType>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js</valueProcess>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>ID_VALUE</name>
- <searchable v="false" />
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
- <entityConsumer>
- <name>Keywords</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
<entityParameter>
- <name>FilteredAttributeIds_param</name>
+ <name>FilteredAttributes_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
- <entityConsumer>
- <name>SpecificAttribute</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>FilteredAttributeIds_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>DisplaySimpleName_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
<entityParameter>
<name>DisplaySimpleName_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
- <entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
</entityFields>
<recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>9565b2b1-ace7-4464-ae76-c71bd8f5f676</name>
- <tableName>AB_ATTRIBUTERELATION</tableName>
- <primaryKey>AB_ATTRIBUTERELATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>AB_ATTRIBUTE_ID.value</name>
- <recordfield>AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_ATTRIBUTERELATIONID.value</name>
- <recordfield>AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_ROWID.value</name>
- <recordfield>AB_ATTRIBUTERELATION.OBJECT_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_TYPE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CHAR_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.CHAR_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.DATE_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NUMBER_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.NUMBER_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ID_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.ID_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>AB_ATTRIBUTERELATION.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>AB_ATTRIBUTERELATION.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>AB_ATTRIBUTERELATION.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>AB_ATTRIBUTERELATION.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INT_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.INT_VALUE</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>PARENT_ID.value</element>
+ <element>VALUE.value</element>
+ <element>VALUE.displayValue</element>
+ <element>AB_ATTRIBUTE_ID.value</element>
+ <element>AB_ATTRIBUTE_ID.displayValue</element>
+ </recordFields>
+ </jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/AttributeRelation_entity/documentation.adoc b/entity/AttributeRelation_entity/documentation.adoc
deleted file mode 100644
index 0f6d6bbdb1b45054b3e3b2a23a7665a8a7f74aee..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/documentation.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-Attribute Relation
-==================
-
-----
-an entity for managing values that are set for an attribute
-----
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
index acda6626ab40309e259438b0dca6da54219b99ec..83b3cd554d6ce3133c6066d44e75f0410ccf6f44 100644
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
@@ -4,4 +4,4 @@ import("Attribute_lib");
result.string(AttributeUtil.getFullAttributeName(
vars.get("$field.AB_ATTRIBUTE_ID"),
- vars.exists("$param.DisplaySimpleName_param") ? vars.get("$param.DisplaySimpleName_param") : false ));
\ No newline at end of file
+ vars.exists("$param.DisplaySimpleName_param") ? vars.get("$param.DisplaySimpleName_param") : false ));
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
index 132c9bbe345620f8d9fc4550c13dcdb87a493487..1cebe1b3feaf01b51d151221f833a7255541bfb5 100644
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
@@ -2,10 +2,7 @@ import("system.vars");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
- vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
- neon.setFieldValue("$field.INT_VALUE", null);
- neon.setFieldValue("$field.CHAR_VALUE", null);
- neon.setFieldValue("$field.DATE_VALUE", null);
- neon.setFieldValue("$field.ID_VALUE", null);
- neon.setFieldValue("$field.NUMBER_VALUE", null);
+ vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ neon.setFieldValue("$field.VALUE", null);
}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/stateProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/stateProcess.js
deleted file mode 100644
index 53cae9c41bac64b97f2de9f9943570c82b7dc677..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/stateProcess.js
+++ /dev/null
@@ -1 +0,0 @@
-//TODO: the attribute id should be readonly if a value is set
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attributerelationid/valueProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attributerelationid/valueProcess.js
deleted file mode 100644
index 622e00f05f77bd63405f4487831518087cc38d27..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/ab_attributerelationid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.util");
-import("system.vars");
-import("system.result");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/alter/children/edit/onActionProcess.js
rename to entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
diff --git a/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js
rename to entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
diff --git a/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js b/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js
deleted file mode 100644
index 91ca68074f8ae51f3149c59954293133708905ea..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-if(!vars.get("$field.INT_VALUE"))
- result.string("0");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js
deleted file mode 100644
index 6c3a508f22bdf1ba7bb7401970a8d6d2d4ab808a..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib")
-
-var attrKeywordSelect = "select KEYWORD_CONTAINER from AB_ATTRIBUTE";
-attrKeywordSelect = SqlCondition.begin()
- .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
- .buildSql(attrKeywordSelect);
-result.string(db.cell(attrKeywordSelect));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js
deleted file mode 100644
index 0ad606c237d8cdb5310fa2818e3edd9d14d6ab93..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib")
-
-var attrKeywordSelect = "select KEYWORD_CONTAINER from AB_ATTRIBUTE";
-attrKeywordSelect = SqlCondition.begin()
- .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
- .buildSql(attrKeywordSelect);
-result.string(db.cell(attrKeywordSelect));
diff --git a/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js b/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js
deleted file mode 100644
index 4e3d5a6e480d22383542cbb74c8bc5c9dd2c733d..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param") != null)
- result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js b/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js
deleted file mode 100644
index 2ce3f28be961ff856705b9dc395e33eb2976f0f2..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param") != null)
- result.string(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
rename to entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js
deleted file mode 100644
index 17644822bd69a810a5e2a0c871d651b482e37d6a..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.exists("$param.DisplaySimpleName_param") ? vars.get("$param.DisplaySimpleName_param") : "");
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js
deleted file mode 100644
index 0f10b7075d3dbe124dd9048f5ae7b3d092616329..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.exists("$param.FilteredAttributeIds_param") ? vars.get("$param.FilteredAttributeIds_param") : "");
diff --git a/entity/AttributeRelation_entity/entityfields/specificattributes/children/filteredattributeids_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattributes/children/filteredattributeids_param/valueProcess.js
deleted file mode 100644
index 71802ad6ba34158c3344111a02c912789ae97f79..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/specificattributes/children/filteredattributeids_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.exists("$param.FilteredAttributeIds_param") ? vars.get("$param.FilteredAttributeIds_param") : "");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/specificattributes/children/objecttype_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattributes/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 26ba533642c539c7d4a4f1cf7dd8d306a6d3903e..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/specificattributes/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.exists("$param.ObjectType_param") ? vars.get("$param.ObjectType_param") : "");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cda204045d2aba9ae974e0ce2200ba0cc6c852c0
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string(true);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js b/entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js
similarity index 97%
rename from entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
rename to entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js
index e692170633914456e09edf154860eb0a1f6842ef..55d32c91b7003e4a973558a6460268ef5b6d962b 100644
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
result.string(AttributeTypeUtil.getContentType(attributeType));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js b/entity/AttributeRelation_entity/entityfields/value/displayValueProcess.js
similarity index 88%
rename from entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js
rename to entity/AttributeRelation_entity/entityfields/value/displayValueProcess.js
index 412402a7e204e4fd01e21b755ae15ab57a5ceaa5..91fc6107db9e8b3463fb035389501cb7910ce855 100644
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/value/displayValueProcess.js
@@ -1,26 +1,26 @@
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-import("Keyword_lib");
-
-var attrType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
-var value;
-if (attrType == $AttributeTypes.COMBO)
- value = AttributeUtil.getSimpleAttributeName(vars.get("$field.ID_VALUE"));
-
-//TODO this is a workaround for keywords, when it's possible to use the consumer remove this else if
-else if (attrType == $AttributeTypes.KEYWORD)
-{
- var keywordContainer = db.cell(
- SqlCondition.begin()
- .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
- .buildSql("select KEYWORD_CONTAINER from AB_ATTRIBUTE")
- );
- value = KeywordUtils.getViewValue(keywordContainer, vars.get("$field.ID_VALUE"));
-}
-
-else
- value = vars.get("$field.valueProxy");
-
-result.string(value);
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+import("Keyword_lib");
+
+var attrType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
+var value;
+if (attrType == $AttributeTypes.COMBO)
+ value = AttributeUtil.getSimpleAttributeName(vars.get("$field.VALUE"));
+
+//TODO this is a workaround for keywords, when it's possible to use the consumer remove this else if
+else if (attrType == $AttributeTypes.KEYWORD)
+{
+ var keywordContainer = db.cell(
+ SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
+ .buildSql("select KEYWORD_CONTAINER from AB_ATTRIBUTE")
+ );
+ value = KeywordUtils.getViewValue(keywordContainer, vars.get("$field.VALUE"));
+}
+
+else
+ value = vars.get("$field.VALUE");
+
+result.string(value);
diff --git a/entity/AttributeRelationTree_entity/entityfields/value/dropDownProcess.js b/entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/value/dropDownProcess.js
rename to entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js
diff --git a/entity/AttributeRelationTree_entity/entityfields/value/mandatoryProcess.js b/entity/AttributeRelation_entity/entityfields/value/mandatoryProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/value/mandatoryProcess.js
rename to entity/AttributeRelation_entity/entityfields/value/mandatoryProcess.js
diff --git a/entity/AttributeRelationTree_entity/entityfields/value/stateProcess.js b/entity/AttributeRelation_entity/entityfields/value/stateProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/value/stateProcess.js
rename to entity/AttributeRelation_entity/entityfields/value/stateProcess.js
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/dropDownProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/dropDownProcess.js
deleted file mode 100644
index 104cdfb69131ecc5c4cd06163ae52cf16283c408..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/dropDownProcess.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import("system.translate");
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-import("Sql_lib");
-
-var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
-var attrType = AttributeUtil.getAttributeType(attributeId);
-
-if (attrType == $AttributeTypes.COMBO)
-{
- var valueSql = SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_ACTIVE", "1")
- .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attributeId)
- .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE)
- .buildSql("select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE", "1=2", "order by SORTING asc");
- var valueList = db.table(valueSql);
- result.object(valueList);
-}
-else if (attrType == $AttributeTypes.BOOLEAN)
-{
- result.object([
- ["1", translate.text("Yes")],
- ["0", translate.text("No")]
- ]);
-}
-
-//TODO this is a workaround for keywords, when it's possible to use the consumer remove this
-else if (attrType == $AttributeTypes.KEYWORD)
-{
- var attrKeywordSelect = "select KEYWORD_CONTAINER from AB_ATTRIBUTE";
- attrKeywordSelect = SqlCondition.begin()
- .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
- .buildSql(attrKeywordSelect);
-
- var sql = SqlCondition.begin()
- .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", db.cell(attrKeywordSelect))
- .buildSql("select AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY", "1=2", "order by SORTING asc");
- var keywords = db.table(sql).map(function (row)
- {
- return [row[0], translate.text(row[1])];
- });
- result.object(keywords);
-}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/mandatoryProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/mandatoryProcess.js
deleted file mode 100644
index e60d633a87eef5815501eb3cef2e8d7f69c71c04..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/mandatoryProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
-var contentType = AttributeTypeUtil.getContentType(attributeType);
-result.string(contentType != null && contentType != "BOOLEAN");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js b/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js
deleted file mode 100644
index 44aaa91f083773956443f739a0d9cb8e6705330a..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("Entity_lib");
-import("Attribute_lib");
-
-var attrValue = vars.exists("$field.valueProxy") ? vars.get("$field.valueProxy") : "";
-attrValue = ProcessHandlingUtils.getOnValidationValue(attrValue);
-
-if (attrValue != null)
-{
- var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
- var attrField = (function (pType)
- {
- switch (pType)
- {
- case $AttributeTypes.TEXT.toString():
- case $AttributeTypes.MEMO.toString():
- return "$field.CHAR_VALUE";
- case $AttributeTypes.DATE.toString():
- return "$field.DATE_VALUE";
- case $AttributeTypes.NUMBER.toString():
- return "$field.NUMBER_VALUE";
- case $AttributeTypes.BOOLEAN.toString():
- return "$field.INT_VALUE";
- case $AttributeTypes.COMBO.toString():
- case $AttributeTypes.KEYWORD.toString():
- return "$field.ID_VALUE";
- default:
- return null;
- }
- }).call(null, attributeType);
-
- if (attrField)
- neon.setFieldValue(attrField, attrValue);
-}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/stateProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/stateProcess.js
deleted file mode 100644
index 62f33ac87ce0bb62f052b945600933cf1b80cb2f..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/stateProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
-var fieldState;
-if (AttributeTypeUtil.getContentType(attributeType) != null)
- fieldState = neon.COMPONENTSTATE_EDITABLE;
-else
- fieldState = neon.COMPONENTSTATE_READONLY;
-
-result.string(fieldState);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
deleted file mode 100644
index 10d3aadcf50110dd9da7e5b189729ebd2f8174dd..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
-{
- var rowId = vars.get("$param.ObjectRowId_param");
- var objectType = vars.get("$param.ObjectType_param");
- var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
-
- var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
- var attrField = (function (type)
- {
- switch (type)
- {
- case $AttributeTypes.TEXT.toString():
- case $AttributeTypes.MEMO.toString():
- return "$field.CHAR_VALUE";
- case $AttributeTypes.DATE.toString():
- return "$field.DATE_VALUE";
- case $AttributeTypes.NUMBER.toString():
- return "$field.NUMBER_VALUE";
- case $AttributeTypes.BOOLEAN.toString():
- return "$field.INT_VALUE";
- case $AttributeTypes.COMBO.toString():
- case $AttributeTypes.KEYWORD.toString():
- return "$field.ID_VALUE";
- }
- }).call(null, attributeType);
- var value = null;
- if (attrField != null) //load the value from the correct field for the type
- value = vars.get(attrField);
-
- if(value != null && value != "")
- result.string(value);
- else if (attributeType == $AttributeTypes.VOID)
- result.string("");
-}
-
diff --git a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
deleted file mode 100644
index 067a0196f0b0bc7dd086dae9f2cdab2611ae8dd7..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import("system.vars");
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var condition = new SqlCondition();
-
-if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
-{
- condition.andPrepareVars("AB_ATTRIBUTERELATION.OBJECT_ROWID", "$param.ObjectRowId_param")
- .andPrepareVars("AB_ATTRIBUTERELATION.OBJECT_TYPE", "$param.ObjectType_param");
- if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
- {
- var filteredIds = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
- var filteredIdsCondition = new SqlCondition();
-
- filteredIds.forEach(function(id)
- {
- this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", id);
- }, filteredIdsCondition);
-
- condition.andSqlCondition(filteredIdsCondition);
- }
-}
-result.string(db.translateCondition(condition.build("1=2")));
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
similarity index 76%
rename from entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js
rename to entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
index 71b97a1051d5bd3a170845c52e8bfcd419f7355a..b60dafb2bd2b68fcd7ea719b0bf906db9036f5be 100644
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
@@ -6,6 +6,8 @@ import("Sql_lib");
var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
var rowId = vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param");
+var getTree = vars.exists("$param.GetTree_param") && vars.getString("$param.GetTree_param") == "true";
+var displaySimpleName = vars.exists("$param.DisplaySimpleName_param") && vars.get("$param.DisplaySimpleName_param");
var allAttributes = [];
var attributeObj = {};
var sqlSelect = "select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, '', '', '', ATTRIBUTE_NAME from AB_ATTRIBUTE";
@@ -21,12 +23,26 @@ if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
idCond.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", id);
});
attrCond.andSqlCondition(idCond);
+ getTree = false;
}
else if (rowId)
{
attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
if (objectType != null)
attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
+
+ if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
+ {
+ var filteredIds = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
+ var filteredIdsCondition = new SqlCondition();
+
+ filteredIds.forEach(function(id)
+ {
+ this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", id);
+ }, filteredIdsCondition);
+
+ attrCond.andSqlCondition(filteredIdsCondition);
+ }
}
var defaultFields = [
"AB_ATTRIBUTERELATIONID",
@@ -47,6 +63,11 @@ var attributeValues = db.table(attributeSql).map(function (row)
{
let attributeId = row[1];
let attributeName = row[4];
+ if (!getTree && !displaySimpleName && row[2])
+ {
+ let parentName = AttributeUtil.getFullAttributeName(row[2]);
+ attributeName = (parentName ? parentName + " / " : "") + attributeName;
+ }
let value = row[AttributeTypeUtil.getTypeColumnIndex(row[3]) + defaultFields.length];
let viewValue;
if (row[3].trim() == $AttributeTypes.COMBO)
@@ -57,12 +78,11 @@ var attributeValues = db.table(attributeSql).map(function (row)
return [row[0], row[2], value, viewValue, attributeId, attributeName];
});
-
-_fetchAttributes(attributeValues.map(function (row) {return row[1]}));
+if (getTree)
+ _fetchAttributes(attributeValues.map(function (row) {return row[1]}));
allAttributes = _sortArrayForTree(allAttributes).concat(attributeValues);
-
result.object(allAttributes);
function _fetchAttributes (pAttributeIds)
@@ -90,6 +110,8 @@ function _fetchAttributes (pAttributeIds)
function _sortArrayForTree (pArray)
{
+ if (pArray.length <= 1)
+ return pArray;
var rows = {};
var allIds = {};
var idIndex = 0;
@@ -98,8 +120,7 @@ function _sortArrayForTree (pArray)
pArray.forEach(function (row) {allIds[row[idIndex]] = true;});
var index = 0;
- for (let itemsAdded = true; itemsAdded; itemsAdded = oldIndex != index)
- {
+ do {
var oldIndex = index;
pArray.forEach(function (row)
{
@@ -109,7 +130,7 @@ function _sortArrayForTree (pArray)
index : index++
};
}, rows);
- }
+ } while (oldIndex != index);
var sortedArray = new Array(index);
for (let i in rows)
sortedArray[rows[i].index] = rows[i].data;
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..ceb46c3e0c977ab16c75822061a0472088410aea
--- /dev/null
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+import("system.db");
+
+if (vars.get("$field.AB_ATTRIBUTE_ID"))
+{
+ db.deleteData("AB_ATTRIBUTERELATION", SqlCondition.equals("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", vars.get("$field.UID"), "1=2"));
+ neon.refresh();
+}
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js
similarity index 88%
rename from entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js
rename to entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js
index 966cc3043ec5a1db5f1e2c05fa1e7e92c83c1f04..a66bb8f178cd09c7df3b9433e7953f9f7ba7fc4d 100644
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js
@@ -13,12 +13,12 @@ var columns = [
"USER_NEW"
];
var values = [
- util.getNewUUID(),
+ vars.get("$field.UID"),
vars.get("$field.AB_ATTRIBUTE_ID"),
vars.get("$param.ObjectRowId_param"),
vars.get("$param.ObjectType_param"),
- vars.get("$sys.date"),
- vars.get("$sys.user")
+ vars.get("$field.DATE_NEW"),
+ vars.get("$field.USER_NEW")
];
var type = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
var valueField = AttributeTypeUtil.getDatabaseField(type);
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
similarity index 79%
rename from entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js
rename to entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
index 6eb94014514b4a6aa7fc68f96c4666019ad2d78a..b5eefe863b08101fa13a4a85ea32af8582f63f69 100644
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
@@ -13,8 +13,8 @@ var columns = [
];
var values = [
vars.get("$field.AB_ATTRIBUTE_ID"),
- vars.get("$sys.date"),
- vars.get("$sys.user")
+ vars.get("$field.DATE_EDIT"),
+ vars.get("$field.USER_EDIT")
];
var dbFields = AttributeTypeUtil.getAllDatabaseFields();
@@ -26,4 +26,4 @@ dbFields.forEach(function (row)
values[AttributeTypeUtil.getTypeColumnIndex(type) + 3] = vars.get("$field.VALUE");
db.updateData("AB_ATTRIBUTERELATION", columns, null, values,
- SqlCondition.begin().andPrepareVars("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", "$field.UID").build("1=2"));
\ No newline at end of file
+ SqlCondition.equals("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", vars.get("$field.UID"), "1=2"));
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index c80f70d86bf9bbf1e6ec63e1efbb7d37fae62c5b..bbf966130390c69673ec10c9d59d682481b38aba 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>AttributeUsage_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
- <title>Attribute Usage</title>
+ <title>Usage</title>
<onValidation>%aditoprj%/entity/AttributeUsage_entity/onValidation.js</onValidation>
<recordContainer>db</recordContainer>
<entityFields>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 9b5d377d95dc6216db834559c4c1a0bf68f162e9..03767a7d2e59bd703069ab2f72b3eb970a8b5033 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Attribute_entity</name>
- <title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
+ <title>Attribute</title>
+ <contentTitleProcess>%aditoprj%/entity/Attribute_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Attribute_entity/onValidation.js</onValidation>
<iconId>VAADIN:TAG</iconId>
- <titleProcess>%aditoprj%/entity/Attribute_entity/titleProcess.js</titleProcess>
+ <titlePlural>Attributes</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
@@ -46,7 +47,6 @@
</entityField>
<entityConsumer>
<name>AttributeChildren</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/stateProcess.js</stateProcess>
<dependency>
@@ -108,7 +108,6 @@
</entityParameter>
<entityConsumer>
<name>AttributeUsages</name>
- <title>Usage</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -167,6 +166,7 @@
<entityParameter>
<name>AttrParentType_param</name>
<expose v="true" />
+ <triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
@@ -179,12 +179,6 @@
<fieldType>DEPENDENCY_IN</fieldType>
<lookupIdfield>UID</lookupIdfield>
<dependencies>
- <entityDependency>
- <name>342e8ba6-db61-411b-9f79-e9271335b00f</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
<entityName>AttributeRelationTree_entity</entityName>
@@ -295,6 +289,10 @@
<name>AttrParentId_param</name>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroup/children/attrparentid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>AttrParentType_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroup/children/attrparenttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/Attribute_entity/contentTitleProcess.js b/entity/Attribute_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e55588aa4fb9dea4ee26b065951ab47b1ad43256
--- /dev/null
+++ b/entity/Attribute_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.FULL_ATTRIBUTE_NAME"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributegroup/children/attrparenttype_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributegroup/children/attrparenttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fe18eca06c7f87d798bd3e58c7726058b5bf049f
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attributegroup/children/attrparenttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.ATTRIBUTE_TYPE").trim());
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
index 7138f08073c5716c5d7aa7cf35861251d5ddecfa..a97ab81b0f09af21e26f719980e1a8348dd90a02 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -13,8 +13,8 @@ var sqlSelect = "select SELF.AB_ATTRIBUTEID, SELF.ATTRIBUTE_PARENT_ID, SELF.ATTR
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "SELF.ATTRIBUTE_TYPE") //3
+ ", '', SELF.ATTRIBUTE_NAME, PARENT1.ATTRIBUTE_NAME, PARENT2.ATTRIBUTE_NAME, PARENT2.ATTRIBUTE_PARENT_ID "
+ "from AB_ATTRIBUTE SELF "
- + "left join AB_ATTRIBUTE PARENT1 on SELF.ATTRIBUTE_PARENT_ID = PARENT1.AB_ATTRIBUTEID "
- + "left join AB_ATTRIBUTE PARENT2 ON PARENT1.ATTRIBUTE_PARENT_ID = PARENT2.AB_ATTRIBUTEID";
+ + "left join AB_ATTRIBUTE PARENT1 on SELF.ATTRIBUTE_PARENT_ID = PARENT1.AB_ATTRIBUTEID " //always select the names of the next 2 parents so that less queries
+ + "left join AB_ATTRIBUTE PARENT2 ON PARENT1.ATTRIBUTE_PARENT_ID = PARENT2.AB_ATTRIBUTEID"; //are required later when buildung the full name
var condition = SqlCondition.begin();
var sqlOrder = " order by SELF.ATTRIBUTE_PARENT_ID asc, SELF.SORTING asc";
@@ -33,8 +33,11 @@ else if (getGroups) //if getGroups == true, it is the lookup for selecting the s
var isGroupCondition = SqlCondition.begin();
for (let type in $AttributeTypes)
- if ($AttributeTypes[type].isGroup && $AttributeTypes[type] != $AttributeTypes.COMBO)
+ if ($AttributeTypes[type].isGroup && $AttributeTypes[type] != $AttributeTypes.COMBO
+ && (parentType == $AttributeTypes.VOID || $AttributeTypes[type] != $AttributeTypes.VOID))
+ {
isGroupCondition.orPrepare(["AB_ATTRIBUTE", "ATTRIBUTE_TYPE", uidTableAlias], $AttributeTypes[type]);
+ }
condition.andSqlCondition(SqlCondition.begin()
.andSqlCondition(isGroupCondition)
@@ -88,9 +91,7 @@ function _buildAttributeTable (pAttributes)
var arrayIndex = 0;
- //stops the loop when no new items were added so that recursive relations between attributes don't cause an infinite loop
- for (let itemsAdded = true; itemsAdded; itemsAdded = oldIndex != arrayIndex)
- {
+ do {
var oldIndex = arrayIndex;
pAttributes.forEach(function (row)
{
@@ -102,7 +103,8 @@ function _buildAttributeTable (pAttributes)
index : arrayIndex++
};
}, rows);
- }
+ } while (oldIndex != arrayIndex); //stops the loop when no new items were added so that recursive relations between attributes don't cause an infinite loop
+
var displaySimpleName = vars.exists("$param.DisplaySimpleName_param") && vars.get("$param.DisplaySimpleName_param");
var sortedArray = new Array(Object.keys(rows).length);
for (let i in rows)
@@ -114,8 +116,7 @@ function _buildAttributeTable (pAttributes)
.andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", rowData[0])
.buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE")
);
- if (usages.length)
- rowData[7] = usages.join(", ");
+ rowData[7] = usages.join(", ");
}
var fullName = displaySimpleName
? rowData[8]
diff --git a/entity/Attribute_entity/titleProcess.js b/entity/Attribute_entity/titleProcess.js
deleted file mode 100644
index 6c91b3719546dea2ae511dd9bc8bc03c453af114..0000000000000000000000000000000000000000
--- a/entity/Attribute_entity/titleProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-var title = vars.get("$field.FULL_ATTRIBUTE_NAME");
-if (!(vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))) //TODO: the prefix shouldn't be in the lookup, this condition is a workaround
- title = ContextUtils.prefixWithCurrentContextTitle(title);
-result.string(title);
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index af54d522f5456756c0fe42a572fb5e15991bcb95..d7272d437efde682b4229c0a8a740e9d04f35586 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>CampaignAddParticipants_entity</name>
- <title>Add participants to Campaign</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Add participants to Campaign</title>
<afterOperatingState>%aditoprj%/entity/CampaignAddParticipants_entity/afterOperatingState.js</afterOperatingState>
<recordContainer>jdito</recordContainer>
<entityFields>
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index ce2bfa04290f59e0d85687af903279bb0a397069..d01e2640d0247224dbbd4d1b16dbe666ae87ecda 100644
--- a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
+++ b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>CampaignAnalysis_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
index 7d3ad07314968cf32cb6a677ac342433b6bd3883..bf72bda9e0f16afacbd2456f01a70c0a294cdef5 100644
--- a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
+++ b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>CampaignCost_entitiy</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<afterOperatingState>%aditoprj%/entity/CampaignCost_entitiy/afterOperatingState.js</afterOperatingState>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index d5f23cd0e3db8f5331fc9a398859e9612020908e..eb01a022380b75af2034cf790dcba9690416ec68 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>CampaignParticipant_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Participant</title>
<afterOperatingState>%aditoprj%/entity/CampaignParticipant_entity/afterOperatingState.js</afterOperatingState>
+ <titlePlural>Participants</titlePlural>
<recordContainer>ParticipantsDbRecordContainer</recordContainer>
<entityFields>
<entityProvider>
@@ -91,7 +93,6 @@
</entityField>
<entityConsumer>
<name>CampaignsConsumer</name>
- <title>Campaign</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 2d3064f2eeb27d5a97960f5e58cad0ec447e92e0..738e536c447921e6e4182ab3dccfd0ff4e9544c4 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>CampaignStep_entity</name>
- <title>Campaign Step</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>NEON:GROUP_APPOINTMENT</icon>
- <titleProcess>%aditoprj%/entity/CampaignStep_entity/titleProcess.js</titleProcess>
+ <title>Campaign Step</title>
+ <contentTitleProcess>%aditoprj%/entity/CampaignStep_entity/contentTitleProcess.js</contentTitleProcess>
+ <titlePlural>Steps</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -166,7 +167,6 @@
</entityField>
<entityConsumer>
<name>CampaignParticipantsConsumer</name>
- <title>Participants</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<selectionMode>MULTI</selectionMode>
<dependency>
@@ -213,7 +213,6 @@
</entityConsumer>
<entityConsumer>
<name>CampaignStepCosts</name>
- <title>Cost</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/CampaignStep_entity/contentTitleProcess.js b/entity/CampaignStep_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..33f139bb3d446b844820ecaf7443db266043bc13
--- /dev/null
+++ b/entity/CampaignStep_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$field.NAME"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/titleProcess.js b/entity/CampaignStep_entity/titleProcess.js
deleted file mode 100644
index 429260276f9d30b111be834373ee1613df1f7084..0000000000000000000000000000000000000000
--- a/entity/CampaignStep_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Context_lib");
-import("system.result");
-import("system.vars");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.getString("$field.NAME")));
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 6a7611c27c2dba852000048c500f084a45466e1e..867930d1b2638420c9a4d36a5c2a029230f394cf 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Campaign_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:GROUP</icon>
<title>Campaign</title>
- <titleProcess>%aditoprj%/entity/Campaign_entity/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/Campaign_entity/contentTitleProcess.js</contentTitleProcess>
+ <titlePlural>Campaigns</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -83,7 +84,6 @@
</entityField>
<entityConsumer>
<name>CampaignSteps</name>
- <title>Steps</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -156,7 +156,6 @@
</entityProvider>
<entityConsumer>
<name>CampaignParticipants</name>
- <title>Participants</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<selectionMode>MULTI</selectionMode>
<dependency>
@@ -191,7 +190,6 @@
</entityConsumer>
<entityConsumer>
<name>CampaignCosts</name>
- <title>Costs</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Campaign_entity/contentTitleProcess.js b/entity/Campaign_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..33f139bb3d446b844820ecaf7443db266043bc13
--- /dev/null
+++ b/entity/Campaign_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$field.NAME"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/titleProcess.js b/entity/Campaign_entity/titleProcess.js
deleted file mode 100644
index 429260276f9d30b111be834373ee1613df1f7084..0000000000000000000000000000000000000000
--- a/entity/Campaign_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Context_lib");
-import("system.result");
-import("system.vars");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.getString("$field.NAME")));
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 0403fc04b9cae3305eed3203e139b26f2b3baeb5..6d3b6286e8a3fa3fe93e6981caa300a86e9cac19 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Communication_entity</name>
- <title>Communication</title>
<description>former Comm</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/Communication_entity/titleProcess.js</titleProcess>
+ <title>Communication</title>
+ <contentTitleProcess>%aditoprj%/entity/Communication_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
diff --git a/entity/Communication_entity/titleProcess.js b/entity/Communication_entity/contentTitleProcess.js
similarity index 100%
rename from entity/Communication_entity/titleProcess.js
rename to entity/Communication_entity/contentTitleProcess.js
diff --git a/entity/Communication_entity/entityfields/addr/onValueChange.js b/entity/Communication_entity/entityfields/addr/onValueChange.js
index 95fae13ee0276228a3a474b6fbd4ce0510da00af..4517edfecfa0ffcdfd901ecab5be6ed402a90348 100644
--- a/entity/Communication_entity/entityfields/addr/onValueChange.js
+++ b/entity/Communication_entity/entityfields/addr/onValueChange.js
@@ -4,7 +4,7 @@ import("KeywordRegistry_basic");
import("Keyword_lib");
import("system.vars");
-var addr = vars.get("$this.value");
+var addr = vars.get("$local.value");
if (addr)
{
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 97b6330b429cf6f3ab3e99cc247ee0803dfa0314..79c4faa62b8f3f2464d4a4029d6720eb3d59993c 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Contact_entity</name>
- <title>Contact</title>
- <description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
+ <title>Contact</title>
<onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
<iconId>VAADIN:USERS</iconId>
+ <titlePlural>Contacts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -99,7 +99,6 @@
</entityField>
<entityConsumer>
<name>Communications</name>
- <title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -115,7 +114,6 @@
</entityConsumer>
<entityConsumer>
<name>ContactAddresses</name>
- <title>Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -151,6 +149,7 @@
<fieldType>DEPENDENCY_IN</fieldType>
<targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
+ <titlePlural>Other Contactroles</titlePlural>
<dependencies>
<entityDependency>
<name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 9642361e6bd5219fdd4e031246838d98a6e4562f..671c89ff5ba1078893186e36daeee4a7ef78ffc7 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Context_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
- <titleProcess>%aditoprj%/entity/Context_entity/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/Context_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Context_entity/titleProcess.js b/entity/Context_entity/contentTitleProcess.js
similarity index 100%
rename from entity/Context_entity/titleProcess.js
rename to entity/Context_entity/contentTitleProcess.js
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index fcac2f5cbf4f5775864bc6845a0244bee4d86ea1..ef47ec1799cea63c2483986d3a98d2170052d42f 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Contract_entity</name>
- <title>Contract</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
+ <title>Contract</title>
+ <contentTitleProcess>%aditoprj%/entity/Contract_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Contract_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:FILE_TEXT</iconId>
- <titleProcess>%aditoprj%/entity/Contract_entity/titleProcess.js</titleProcess>
+ <titlePlural>Contracts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -135,7 +136,6 @@
</entityFieldGroup>
<entityConsumer>
<name>Activities</name>
- <title>Activities</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -186,7 +186,6 @@
</entityField>
<entityConsumer>
<name>Documents</name>
- <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -213,7 +212,6 @@
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
- <title>Maindocuments</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
@@ -295,12 +293,11 @@
</entityActionField>
<entityConsumer>
<name>Attributes</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -319,11 +316,10 @@
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
@@ -341,7 +337,6 @@
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
- <title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
@@ -371,6 +366,21 @@
<onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contract_entity/contentTitleProcess.js b/entity/Contract_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..46f60176775fe07563734ff5f62aa714afa71e45
--- /dev/null
+++ b/entity/Contract_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTRACTCODE_DISPLAY_fieldGroup"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f3a33022dd2768fb78f05bafc713ba43d6272145
--- /dev/null
+++ b/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.CONTRACTID"), tableNames: ["AB_ATTRIBUTERELATION"]});
+res.push({id: vars.get("$field.CONTRACTID"), tableNames: ["CONTRACT"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Contract_entity/titleProcess.js b/entity/Contract_entity/titleProcess.js
deleted file mode 100644
index 3432c05f4a705f9e680c966699b8250a10f8fe53..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.CONTRACTCODE_DISPLAY_fieldGroup")));
\ No newline at end of file
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 5d3825128ebd53eaad1da4400940229c4f672627..9e1729aa2b873c23ae517c8e57373dde09f20431 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Countries_Entity</name>
- <title>Countries</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
+ <title>Countries</title>
+ <contentTitleProcess>%aditoprj%/entity/Countries_Entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:FLAG</iconId>
- <titleProcess>%aditoprj%/entity/Countries_Entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Countries_Entity/contentTitleProcess.js b/entity/Countries_Entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b23edec46e0092a426e1a7376ce817c42fd35b4d
--- /dev/null
+++ b/entity/Countries_Entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.NAME_TRANSLATED"));
\ No newline at end of file
diff --git a/entity/Countries_Entity/titleProcess.js b/entity/Countries_Entity/titleProcess.js
deleted file mode 100644
index 27c78a47f571add3d25469cb7eaa9b3662cb62b3..0000000000000000000000000000000000000000
--- a/entity/Countries_Entity/titleProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-import("system.vars");
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.NAME_TRANSLATED")));
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 2032db10812de3140ce509e0949c724168b239ab..ae3e58dcdf196205f60402a740da6424c5483e2f 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Document_entity</name>
- <title>Document</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Document</title>
<iconId>VAADIN:FILE</iconId>
+ <titlePlural>Documents</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js b/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js
index 80be9eaddcb7763b84c6e56259db7e63604f78a7..a09e33e8f53dbe4fa9bf5ffa49f2eccaeec439dd 100644
--- a/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js
+++ b/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js
@@ -1,2 +1,2 @@
import("Document_lib");
-DocumentUtil.downloadSingleDocument();
+DocumentUtil.downloadSelectedDocuments();
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index d98333d1732a46415ccb536481e1e2ed274cfc0d..4d7bc27b2d9e0226c045923db116a10fa40d0e98 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>EmployeeRole_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Role</title>
+ <titlePlural>Roles</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index f7904d74a5f48750d924f6a0786824d6988d6e47..50ffb189a0894cd8a53cffef2eda04a81e87f407 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Employee_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Employee</title>
+ <contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Employee_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
<afterOperatingState>%aditoprj%/entity/Employee_entity/afterOperatingState.js</afterOperatingState>
<iconId>VAADIN:USER</iconId>
- <titleProcess>%aditoprj%/entity/Employee_entity/titleProcess.js</titleProcess>
+ <titlePlural>Employees</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
@@ -106,12 +107,11 @@
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -161,7 +161,6 @@
</entityField>
<entityConsumer>
<name>EmployeeRoles</name>
- <title>Roles</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -177,11 +176,10 @@
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
@@ -197,7 +195,6 @@
</entityConsumer>
<entityConsumer>
<name>Documents</name>
- <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Employee_entity/contentTitleProcess.js b/entity/Employee_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cfe8dbda0147ed4ce85bc5394e118459edb315d1
--- /dev/null
+++ b/entity/Employee_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string((vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME")).trim());
\ No newline at end of file
diff --git a/entity/Employee_entity/titleProcess.js b/entity/Employee_entity/titleProcess.js
deleted file mode 100644
index 2c946bc446bdc882880d688ae373ebdf8561a225..0000000000000000000000000000000000000000
--- a/entity/Employee_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle((vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME")).trim()));
\ No newline at end of file
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 6d047cd927ac348f3dae450e0c72a2d2f970ecc1..7886b1fe7ff7df5e5535a7e666bc459b479a8757 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Gender_keyword</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/Gender_keyword/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/Gender_keyword/contentTitleProcess.js</contentTitleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityField>
diff --git a/entity/Gender_keyword/titleProcess.js b/entity/Gender_keyword/contentTitleProcess.js
similarity index 100%
rename from entity/Gender_keyword/titleProcess.js
rename to entity/Gender_keyword/contentTitleProcess.js
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index a10878bfe9d27169c28993b456511ef2315e2a4a..949e36744e228a6b68682155ff7cc29a296829b0 100644
--- a/entity/IndexSearchEntity/IndexSearchEntity.aod
+++ b/entity/IndexSearchEntity/IndexSearchEntity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>IndexSearchEntity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityFields>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 0e08424f92288ae9712eef6fe33adcea1977e4bf..d773e48134a803b34f042f1c4838e83b46e7eac4 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>KeywordAttributeRelation_entity</name>
- <title>Keyword Attribute Values</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
+ <title>Keyword Attribute Values</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -42,7 +42,7 @@
<entityProvider>
<name>AttributesForKeywordEntry</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <title></title>
+ <titlePlural></titlePlural>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index fb8c613274acac9d772d7323b2c6981510f317e5..2d6bac09ae4f9e68cca3c410596cde5c8c1b9aac 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>KeywordAttribute_entity</name>
- <title>Keyword Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
+ <title>Keyword Attribute</title>
+ <contentTitleProcess>%aditoprj%/entity/KeywordAttribute_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:KEY_O</iconId>
<iconIdProcess>%aditoprj%/entity/KeywordAttribute_entity/iconIdProcess.js</iconIdProcess>
- <titleProcess>%aditoprj%/entity/KeywordAttribute_entity/titleProcess.js</titleProcess>
+ <titlePlural>Keyword Attributes</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/KeywordAttribute_entity/contentTitleProcess.js b/entity/KeywordAttribute_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..28fd67de270b497ba718dd4e91766bd22936f67e
--- /dev/null
+++ b/entity/KeywordAttribute_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.NAME"));
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/titleProcess.js b/entity/KeywordAttribute_entity/titleProcess.js
deleted file mode 100644
index 53fee4be6adf0706c04c01952405a9792b65feb5..0000000000000000000000000000000000000000
--- a/entity/KeywordAttribute_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.NAME")));
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 6f3c591388a32dd3d3c1236061bd0ed30f21a18c..69b7a2f12da74c9c407f0a6746479609fe838a12 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>KeywordEntry_entity</name>
- <title>Keyword</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
+ <title>Keyword</title>
+ <contentTitleProcess>%aditoprj%/entity/KeywordEntry_entity/contentTitleProcess.js</contentTitleProcess>
<onValidation>%aditoprj%/entity/KeywordEntry_entity/onValidation.js</onValidation>
<iconId>VAADIN:KEY</iconId>
<iconIdProcess>%aditoprj%/entity/KeywordEntry_entity/iconIdProcess.js</iconIdProcess>
- <titleProcess>%aditoprj%/entity/KeywordEntry_entity/titleProcess.js</titleProcess>
+ <titlePlural>Keywords</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -412,7 +413,6 @@
</entityParameter>
<entityConsumer>
<name>KeywordAttributeRelations</name>
- <title>Keyword Attribute Values</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -429,7 +429,6 @@
</entityConsumer>
<entityConsumer>
<name>KeywordAttributeRelationsReadOnly</name>
- <title>Keyword Attribute Values</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc</documentation>
<state>READONLY</state>
diff --git a/entity/KeywordEntry_entity/contentTitleProcess.js b/entity/KeywordEntry_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a907335e8d11cf3ec8c18651257f5ab8d96a29b9
--- /dev/null
+++ b/entity/KeywordEntry_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.TITLE_TRANSLATED"));
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/titleProcess.js b/entity/KeywordEntry_entity/titleProcess.js
deleted file mode 100644
index 3a9950b109a01757e0892bf8cbbd3c8205514385..0000000000000000000000000000000000000000
--- a/entity/KeywordEntry_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.TITLE_TRANSLATED")));
\ No newline at end of file
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 6141d4364594bab38c246287208de162e915c8d9..b5704dad6c4db49f57125e6da2b43053de2c11d6 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Language_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/Language_entity/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/Language_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Language_entity/titleProcess.js b/entity/Language_entity/contentTitleProcess.js
similarity index 100%
rename from entity/Language_entity/titleProcess.js
rename to entity/Language_entity/contentTitleProcess.js
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..32d999a4f9431a351e8d7cf9d5a3dc0b47fb7546
--- /dev/null
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>LogHistory_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>LogHistory</title>
+ <iconId>NEON:HISTORY</iconId>
+ <imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DATE_NEW</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>SECOND</resolution>
+ <outputFormat></outputFormat>
+ <mandatory v="true" />
+ <groupable v="true" />
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <title>User</title>
+ <mandatory v="true" />
+ <groupable v="true" />
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>TEXT</contentType>
+ <mandatory v="true" />
+ </entityField>
+ <entityProvider>
+ <name>LogHistoryProvider</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>093a40d9-9f20-4c2f-8b43-3eed39b6bede</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>58532bc9-e789-403d-91a5-832ac40d6a6e</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>6caadcde-8fda-40cb-97e0-ae507beab9d7</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f49eacab-f62c-4354-88eb-359cc92c2d44</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>de473d92-dbd3-4300-8887-163c997fcd62</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>1c941565-b8ca-4805-a9d6-d49eb26a9801</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>UID</name>
+ <title>ID</title>
+ <mandatory v="true" />
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/LogHistory_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <isPageable v="false" />
+ <isSortable v="false" />
+ <contentProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <rowCountProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/jdito/rowCountProcess.js</rowCountProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>DATE_NEW.value</element>
+ <element>USER_NEW.value</element>
+ <element>DESCRIPTION.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/LogHistory_entity/entityfields/icon/valueProcess.js b/entity/LogHistory_entity/entityfields/icon/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..99ead80ca86db298117227846aab3b893c0a89c6
--- /dev/null
+++ b/entity/LogHistory_entity/entityfields/icon/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("NEON:HISTORY");
\ No newline at end of file
diff --git a/entity/LogHistory_entity/imageProcess.js b/entity/LogHistory_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1206221d6b2098453563589d3414163150d452e0
--- /dev/null
+++ b/entity/LogHistory_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.ICON"));
\ No newline at end of file
diff --git a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..089be1779e505513066b27516052f5f5194a77b3
--- /dev/null
+++ b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,105 @@
+import("Util_lib");
+import("system.datetime");
+import("system.result");
+import("system.logging");
+import("Loghistory_lib");
+import("JditoFilter_lib");
+import("Sql_lib");
+import("system.vars");
+import("system.db");
+
+var recordCond = SqlCondition.begin();
+
+//condition for only one/some selected records (maybe needed later for preview, etc.)
+//since this a unique ID it's perfectly fine to filter only for the IDs and ignore other filters
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+{
+ recordCond.and(" AB_LOGHISTORY.AB_LOGHISTORYID in ('" + vars.get("$local.idvalues").join("','") + "')");
+}
+else
+{
+ //condition for restricting the loghistory to some specific tables (e.g. only contact-related tables) and a specific ID
+ var tableNameCond = _getTableNameCondition();
+ recordCond.andSqlCondition(tableNameCond);
+
+ //user defined filter
+ if (vars.exists("$local.filter") && vars.get("$local.filter"))
+ {
+ var filter = vars.get("$local.filter");
+ recordCond.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_LOGHISTORY")));
+ }
+}
+
+var dataQuery = recordCond.buildSql("select AB_LOGHISTORY.DATE_NEW, AB_LOGHISTORY.USER_NEW, AB_LOGHISTORY.DESCRIPTION \n\
+ from AB_LOGHISTORY ", "1 = 2", "order by DATE_NEW desc, USER_NEW asc");
+
+var data = db.table(dataQuery);
+var resultData = _groupData(data);
+result.object(resultData);
+
+
+//helper functions:
+
+//creates an identifier for grouping flat table data
+function _makeGroupingIdentifier(pDatetime, pUser)
+{
+ //no need to translate the datepattern since this is only used for internal checks and is never displayed to the user
+ return JSON.stringify({d: datetime.toDate(pDatetime, "yyyy-MM-dd HH:mm"), u: pUser});
+}
+
+//reduce flat talbe data to grouped data. Content is grouped by the "groupingIdentifier" which is generated with "_makeGroupingIdentifier"
+function _groupData(pData)
+{
+ if ( pData.length == 0 )
+ return [];
+
+ var res = [];
+ var logDatetime, logUser, logDesc;
+ [logDatetime, logUser, logDesc] = pData[0];
+ var previousGroupingIdentifier = _makeGroupingIdentifier(logDatetime, logUser);
+ var logUid = previousGroupingIdentifier;//maybe add more information? But for not thats okay
+
+ for ( var i = 1; i < pData.length; i++ )
+ {
+ if (previousGroupingIdentifier == _makeGroupingIdentifier(pData[i][0], pData[i][1]) )
+ {
+ if (logDesc != pData[i][2])
+ logDesc = pData[i][2] + "\n" + logDesc;
+ }
+ else
+ {
+ res.push([logUid, logDatetime, logUser, logDesc]);
+ [logDatetime, logUser, logDesc] = pData[i];
+ previousGroupingIdentifier = _makeGroupingIdentifier(logDatetime, logUser);
+ logUid = previousGroupingIdentifier;
+ }
+ }
+ res.push([logUid, logDatetime, logUser, logDesc]);
+
+ return res;
+}
+
+//converts the very dynamic talbeName-condition to a SqlCondition
+function _getTableNameCondition()
+{
+ var tableNameCond = SqlCondition.begin();
+ var tableNamesList = JSON.parse(vars.get("$param.tablenames_param"));
+
+ //returns the condition for one entry in the tableNamesList
+ var _getCond = function(pDefinition)
+ {
+ var resCond = SqlCondition.begin();
+ pDefinition.tableNames.forEach(function(elem){
+ resCond.orPrepare("AB_LOGHISTORY.TABLENAME", elem);
+ });
+
+ resCond = SqlCondition.begin().andSqlCondition(resCond).andPrepare("AB_LOGHISTORY.TABLENAMEID", pDefinition.id);
+ return resCond;
+ };
+
+ tableNamesList.forEach(function(e){
+ tableNameCond.orSqlCondition(_getCond.call(this, e));
+ });
+
+ return tableNameCond;
+}
\ No newline at end of file
diff --git a/entity/LogHistory_entity/recordcontainers/jdito/rowCountProcess.js b/entity/LogHistory_entity/recordcontainers/jdito/rowCountProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 98a59f5122293c6c342feac29e6298e1abe883a9..6e8f6c4b05710576a103121fd83d38f4fd1ff98f 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>ModuleTree_entity</name>
- <title>Tree Entity</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>History</title>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index dbb94e5cc932ddbe3b4c7e97cac1c93c6f410e02..7e16ca061a6816080fe26477947a2cc1dd16d1c4 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Notification_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Notification</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 2b6aa20cc660016b92ae5a39ff6e02360e28cfcb..0a20dfc5e80b84489c898f47e17cf0f428f8ea4f 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>ObjectRelationType_entity</name>
- <title>Relation type</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:SPLIT</icon>
- <titleProcess>%aditoprj%/entity/ObjectRelationType_entity/titleProcess.js</titleProcess>
+ <title>Relation type</title>
+ <contentTitleProcess>%aditoprj%/entity/ObjectRelationType_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/ObjectRelationType_entity/contentTitleProcess.js b/entity/ObjectRelationType_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dbc0c500302fcbb7dfe706e35445f9f01952daa5
--- /dev/null
+++ b/entity/ObjectRelationType_entity/contentTitleProcess.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+if (vars.exists("$param.OnlyFirstSide_param") && vars.get("$param.OnlyFirstSide_param") == "1" && vars.get("$field.DIRECTION") != "same")
+{
+ result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE")));
+}
+else
+{
+ result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")));
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/titleProcess.js b/entity/ObjectRelationType_entity/titleProcess.js
deleted file mode 100644
index 5f55a99abcb8803e2573f23cf9027f7da40370a6..0000000000000000000000000000000000000000
--- a/entity/ObjectRelationType_entity/titleProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("Context_lib");
-import("system.translate");
-import("system.vars");
-import("system.result");
-
-if (vars.exists("$param.OnlyFirstSide_param") && vars.get("$param.OnlyFirstSide_param") == "1" && vars.get("$field.DIRECTION") != "same")
-{
- result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))));
-}
-else
-{
- result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text(vars.get("$field.SOURCE_RELATION_TITLE"))));
-}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 5424708dceccb47a51dfb27eb99fa8906f20c15b..0829970ad893daac07ff1c120001639d2a5323ba 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>ObjectTree_entity</name>
- <title>Object relation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Object relation</title>
+ <titlePlural>Relations</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 6a5d25ca448bd0b8d61177d7f4c667f84e72a2dc..9680fb42089f0284558ae840065658405838bfea 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Object_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
- <titleProcess>%aditoprj%/entity/Object_entity/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/Object_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Object_entity/titleProcess.js b/entity/Object_entity/contentTitleProcess.js
similarity index 100%
rename from entity/Object_entity/titleProcess.js
rename to entity/Object_entity/contentTitleProcess.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index d8d4f2b4d157abcd69062d6799cc6e15112588bf..05c2f6464ab903608dfa0609d6151b91aa6f273f 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Offer_entity</name>
- <title>Offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
+ <title>Offer</title>
+ <contentTitleProcess>%aditoprj%/entity/Offer_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:CART</iconId>
- <titleProcess>%aditoprj%/entity/Offer_entity/titleProcess.js</titleProcess>
+ <titlePlural>Offers</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -113,7 +114,6 @@
</entityField>
<entityConsumer>
<name>Offeritems</name>
- <title>Offeritems</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<description></description>
<dependency>
@@ -275,7 +275,6 @@
</entityConsumer>
<entityConsumer>
<name>Documents</name>
- <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -386,7 +385,7 @@
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
+ <expose v="true" />
</entityParameter>
</children>
</entityConsumer>
@@ -424,7 +423,6 @@
</entityConsumer>
<entityConsumer>
<name>Activities</name>
- <title>Activities</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -589,7 +587,6 @@
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
- <title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
@@ -619,12 +616,11 @@
</entityField>
<entityConsumer>
<name>Attributes</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -649,11 +645,10 @@
</entityParameter>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
@@ -710,6 +705,21 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Offer_entity/contentTitleProcess.js b/entity/Offer_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..98f9e420320b5614344632935f8bb864a240052e
--- /dev/null
+++ b/entity/Offer_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.OfferCode_VersNr_fieldgroup"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f6fdb0fbfa306482f48611c8049f39fb20a854a3
--- /dev/null
+++ b/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.OFFERID"), tableNames: ["AB_ATTRIBUTERELATION", "OFFERITEM"]});
+res.push({id: vars.get("$field.OFFERID"), tableNames: ["OFFER"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Offer_entity/titleProcess.js b/entity/Offer_entity/titleProcess.js
deleted file mode 100644
index 7baf0cfba8e76a9744e1b9a3253f7f4f8ee97e86..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.OfferCode_VersNr_fieldgroup")));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index fcdb29a9e786f49cb952ea287da3f4e5e6439017..ef0137602441e5a8156f25b772887a79b69cd112 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Offeritem_entity</name>
- <title>Offeritem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
+ <title>Offeritem</title>
<afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
+ <titlePlural>Offeritems</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Options_Entity/Options_Entity.aod b/entity/Options_Entity/Options_Entity.aod
index 6b43ed166ae42e1e09d08df9b292b0f3d5827543..4e33f94cd477ea6fc95737eea7672f7075bcfa7e 100644
--- a/entity/Options_Entity/Options_Entity.aod
+++ b/entity/Options_Entity/Options_Entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Options_Entity</name>
- <title>Options</title>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Options</title>
<iconId>VAADIN:WRENCH</iconId>
<recordContainer>jdito</recordContainer>
<entityFields>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 197dad83f612a49af47bf090e9f4e9bddee8ffda..ac2fc62d49b5274456a37f9e24129bc7b7de66ac 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Order_entity</name>
- <title>Receipt</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
+ <title>Receipt</title>
+ <contentTitleProcess>%aditoprj%/entity/Order_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Order_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:DOLLAR</iconId>
- <titleProcess>%aditoprj%/entity/Order_entity/titleProcess.js</titleProcess>
+ <titlePlural>Receipts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -102,7 +103,6 @@
</entityField>
<entityConsumer>
<name>Orderitems</name>
- <title>Orderitems</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<description></description>
<dependency>
@@ -228,7 +228,6 @@
</entityConsumer>
<entityConsumer>
<name>Documents</name>
- <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -365,7 +364,6 @@
</entityParameter>
<entityConsumer>
<name>Activities</name>
- <title>Activity</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -413,7 +411,6 @@
</entityActionField>
<entityConsumer>
<name>Tasks</name>
- <title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
@@ -438,12 +435,11 @@
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -458,11 +454,10 @@
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
@@ -476,6 +471,21 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Order_entity/contentTitleProcess.js b/entity/Order_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4fd9ebcce2d9cb3ac8262986d7e3424e6a934d3d
--- /dev/null
+++ b/entity/Order_entity/contentTitleProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.OrderCode_VersNr_fieldgroup"));
diff --git a/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5acc0e5c7cd1d3b12b79af369bdeb74e5b2fce2
--- /dev/null
+++ b/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.SALESORDERID"), tableNames: ["AB_ATTRIBUTERELATION", "SALESORDERITEM", "PRODUCT"]});
+res.push({id: vars.get("$field.SALESORDERID"), tableNames: ["SALESORDER"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Order_entity/titleProcess.js b/entity/Order_entity/titleProcess.js
deleted file mode 100644
index 37977fc62e9742a3d34b3cea24de1cbabe06cfa1..0000000000000000000000000000000000000000
--- a/entity/Order_entity/titleProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Context_lib");
-import("system.translate");
-import("system.vars");
-import("system.result");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.OrderCode_VersNr_fieldgroup")));
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 58280b794c4e0b9b51f42c9e92847b25b888b7c3..a3b2b0a7e2f6689ba81888d099d42721d3de2db7 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Orderitem_entity</name>
- <title>Orderitem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
+ <title>Orderitem</title>
<afterOperatingState>%aditoprj%/entity/Orderitem_entity/afterOperatingState.js</afterOperatingState>
+ <titlePlural>Orderitems</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index ef084b993528bee840ace48a489d443730f8403c..6123909d247a64eac74c403c3875074e9749d71b 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Organisation_entity</name>
- <title>Company</title>
<description>former Org</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Organisation_entity/documentation.adoc</documentation>
+ <title>Company</title>
+ <contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:BUILDING</iconId>
<imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
- <titleProcess>%aditoprj%/entity/Organisation_entity/titleProcess.js</titleProcess>
+ <titlePlural>Companies</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -63,7 +64,6 @@
</entityField>
<entityConsumer>
<name>Activities</name>
- <title>Activities</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -84,7 +84,6 @@
</entityConsumer>
<entityConsumer>
<name>Contact</name>
- <title>Contacts</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -136,7 +135,6 @@
</entityProvider>
<entityConsumer>
<name>Addresses</name>
- <title>Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -168,7 +166,6 @@
</entityField>
<entityConsumer>
<name>Communications</name>
- <title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -186,7 +183,6 @@
</entityConsumer>
<entityConsumer>
<name>Contracts</name>
- <title>Contracts</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -205,7 +201,6 @@
</entityConsumer>
<entityConsumer>
<name>Productprices</name>
- <title>Conditions</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -241,7 +236,6 @@
</entityProvider>
<entityConsumer>
<name>Documents</name>
- <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -360,12 +354,11 @@
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -377,14 +370,12 @@
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>ObjectRelations</name>
- <title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -499,7 +490,6 @@
</entityActionField>
<entityConsumer>
<name>Salesprojects</name>
- <title>Salesprojects</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -515,7 +505,6 @@
</entityConsumer>
<entityConsumer>
<name>Offers</name>
- <title>Offers</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -531,7 +520,6 @@
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
- <title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
@@ -560,7 +548,6 @@
</entityParameter>
<entityConsumer>
<name>ObjectTrees</name>
- <title>Object relation</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -586,9 +573,26 @@
<iconId>VAADIN:CALENDAR</iconId>
<tooltip>New Appointment</tooltip>
</entityActionField>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
<entityConsumer>
<name>360DegreeObjects</name>
- <title>360 Degree</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -709,11 +713,10 @@
</entityParameter>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/Organisation_entity/contentTitleProcess.js b/entity/Organisation_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..28fd67de270b497ba718dd4e91766bd22936f67e
--- /dev/null
+++ b/entity/Organisation_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.NAME"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Organisation_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..17ba5b0226b9dfea75bf805ada3e957ad6da28eb
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.CONTACTID"), tableNames: ["CONTACT", "COMMUNICATION", "ADDRESS", "AB_ATTRIBUTERELATION"]});
+res.push({id: vars.get("$field.ORGANISATIONID"), tableNames: ["ORGANISATION"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Organisation_entity/titleProcess.js b/entity/Organisation_entity/titleProcess.js
deleted file mode 100644
index 5f2cd996da8492d6c6ce7a7df50a7a14e47c5796..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.NAME")))
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 416a1bb94be424ac69d458654973b4d6070eacbe..12f6d323c52fa5a7e97e905c52eb462c242a1f1a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Person_entity</name>
- <title>Contact</title>
<description>former Pers</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Person_entity/documentation.adoc</documentation>
+ <title>Contact</title>
+ <contentTitleProcess>%aditoprj%/entity/Person_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Person_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
<iconId>VAADIN:USERS</iconId>
<imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
- <titleProcess>%aditoprj%/entity/Person_entity/titleProcess.js</titleProcess>
+ <titlePlural>Contacts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -85,7 +86,6 @@
</entityFieldGroup>
<entityConsumer>
<name>Activities</name>
- <title>Activities</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -154,7 +154,6 @@
</entityField>
<entityConsumer>
<name>PersAddresses</name>
- <title>Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -177,7 +176,6 @@
</entityConsumer>
<entityConsumer>
<name>Communications</name>
- <title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -213,7 +211,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityConsumer>
<name>Contracts</name>
- <title>Contracts</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -232,7 +229,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityConsumer>
<name>Pricelists</name>
- <title>Conditions</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/pricelists/stateProcess.js</stateProcess>
@@ -297,7 +293,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityField>
<entityConsumer>
<name>Documents</name>
- <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -369,7 +364,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityProvider>
<entityConsumer>
<name>OrgAddresses</name>
- <title>Company Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/stateProcess.js</stateProcess>
@@ -490,7 +484,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityActionField>
<entityConsumer>
<name>ObjectRelations</name>
- <title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -533,7 +526,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityConsumer>
<name>Offers</name>
- <title>Offers</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -565,12 +557,11 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -581,7 +572,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -614,7 +604,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityActionField>
<entityConsumer>
<name>Tasks</name>
- <title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
@@ -639,7 +628,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityConsumer>
<name>ObjectTrees</name>
- <title>Object relation</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -717,9 +705,26 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<dropDownProcess>%aditoprj%/entity/Person_entity/entityfields/contactrole/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
</entityField>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
<entityConsumer>
<name>OtherContacts</name>
- <title>Other Contactroles</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -780,7 +785,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityProvider>
<entityConsumer>
<name>360DegreeObjects</name>
- <title>360 Degree</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -805,11 +809,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityActionField>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/Person_entity/titleProcess.js b/entity/Person_entity/contentTitleProcess.js
similarity index 85%
rename from entity/Person_entity/titleProcess.js
rename to entity/Person_entity/contentTitleProcess.js
index 5f2140b1f8870c878bfc8b06a633618471df0aa5..abaa3df1566528e8dc3e5aad91ac26ab26fe5418 100644
--- a/entity/Person_entity/titleProcess.js
+++ b/entity/Person_entity/contentTitleProcess.js
@@ -1,4 +1,3 @@
-import("Context_lib");
import("system.vars");
import("system.result");
import("Util_lib");
@@ -14,4 +13,4 @@ contact.lastname = vars.get("$field.LASTNAME");
contact.organisationName = vars.get("$field.ORGANISATION_NAME");
var renderer = new ContactTitleRenderer(contact, null);
-result.string(ContextUtils.prefixWithCurrentContextTitle(renderer.asString()));
\ No newline at end of file
+result.string(renderer.asString());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Person_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4941f4e681715d0769512fba14d11801e4fc5d1f
--- /dev/null
+++ b/entity/Person_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.CONTACTID"), tableNames: ["CONTACT", "COMMUNICATION", "ADDRESS", "AB_ATTRIBUTERELATION"]});
+res.push({id: vars.get("$field.PERSONID"), tableNames: ["PERSON"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 92e41c850e4a2c85f2f86bd0cf8692e58767cad0..9acba09cc95a26214b7d68ec8a9f0be3ef30a112 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Prod2prod_entity</name>
- <title>Parts list</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
+ <title>Parts list</title>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index d90fa0affa858861d6744471be0936bf23d77788..90adbe96e8d48676ebd8c05967f1ead44828b6d1 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Product_entity</name>
- <title>Product</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
+ <title>Product</title>
+ <contentTitleProcess>%aditoprj%/entity/Product_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Product_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:HAMMER</iconId>
- <titleProcess>%aditoprj%/entity/Product_entity/titleProcess.js</titleProcess>
+ <titlePlural>Products</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -99,7 +100,6 @@
</entityConsumer>
<entityConsumer>
<name>Productprices</name>
- <title>Prices</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -115,7 +115,6 @@
</entityConsumer>
<entityConsumer>
<name>Stocks</name>
- <title>Stock</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<selectionMode>SINGLE</selectionMode>
<dependency>
@@ -141,7 +140,6 @@
</entityField>
<entityConsumer>
<name>StockCounts</name>
- <title>Stock</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<state>READONLY</state>
<dependency>
@@ -182,7 +180,6 @@
</entityProvider>
<entityConsumer>
<name>ProductLinks</name>
- <title>Parts list</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -218,7 +215,6 @@
</entityField>
<entityConsumer>
<name>Documents</name>
- <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -314,7 +310,6 @@
</entityConsumer>
<entityConsumer>
<name>Activities</name>
- <title>Activity</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -343,12 +338,11 @@
</entityActionField>
<entityConsumer>
<name>Attributes</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -395,7 +389,6 @@
</entityActionField>
<entityConsumer>
<name>Tasks</name>
- <title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
@@ -416,11 +409,10 @@
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
@@ -452,6 +444,21 @@
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Product_entity/contentTitleProcess.js b/entity/Product_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4f684f8c2a25b7c72fb953b045428c87e7271751
--- /dev/null
+++ b/entity/Product_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.PRODUCTNAME"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ba31ad1ef4e48a4004091b122ef98b05f98db8d
--- /dev/null
+++ b/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.PRODUCTID"), tableNames: ["AB_ATTRIBUTERELATION", "PRODUCTPRICE", "ORGANISATION"]}); // TEXTBLOCK missing
+res.push({id: vars.get("$field.PRODUCTID"), tableNames: ["PRODUCT"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Product_entity/titleProcess.js b/entity/Product_entity/titleProcess.js
deleted file mode 100644
index 1df7a714a4dde816d9dded4520659233e3282e80..0000000000000000000000000000000000000000
--- a/entity/Product_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.PRODUCTNAME")));
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 4bcf65351c33b6fdf2475b7d12f731588c1b6e38..5f7bff3cc34e098f3f4234ca346e11a67549fd90 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Productprice_entity</name>
- <title>Prices</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
+ <title>Prices</title>
<afterOperatingState>%aditoprj%/entity/Productprice_entity/afterOperatingState.js</afterOperatingState>
<recordContainer>db</recordContainer>
<entityFields>
@@ -133,6 +133,7 @@
<entityProvider>
<name>Productprices</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <titlePluralProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js</titlePluralProcess>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
diff --git a/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js b/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6d9df5d404b2a6e464b204029df540f71e8c5a0b
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+//title should be "Conditions" in Organisation
+if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
+ result.string(translate.text("Conditions"));
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index 706da95ed47ea12a7daeb2d3aeec0fd5574c0737..1895fe1fbcd143e53989a6b98e84a24290efdaff 100644
--- a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>SalesprojectAnalyses_entity</name>
- <title>Salesproject Analyses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
+ <title>Salesproject Analyses</title>
<iconId>VAADIN:PIE_CHART</iconId>
<recordContainer>jdito</recordContainer>
<entityFields>
diff --git a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
index 1fd132d820c02936fd81381d17a2c8e66ccfe718..ea1ba9eb8fa962e253cd835ff59f4630a001fee6 100644
--- a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
+++ b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>SalesprojectClassificationEntry_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
index 5d641385231995c93a43f6b22be39ddfc23e0e32..c4b9f4f6472a21dfa1558e3170f9793feff6375b 100644
--- a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
+++ b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>SalesprojectClassification_entity</name>
- <title>Classification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Classification</title>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
@@ -35,7 +35,7 @@
<entityProvider>
<name>SalesprojectClassifications</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <title>Classification</title>
+ <titlePlural>Classification</titlePlural>
<recordContainer>jdito</recordContainer>
<dependencies>
<entityDependency>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 3cce36f25a3003e6a3d2b4b65ffea5aa7d574b28..c7cea65bb57c2342d02ea2b7d1b258c97dc092c0 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>SalesprojectCompetition_entity</name>
- <title>Competition</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Competition</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -231,24 +231,14 @@
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<state>DISABLED</state>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>FilteredAttributeIds_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
@@ -257,6 +247,14 @@
<name>DisplaySimpleName_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>FilteredAttributes_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js
rename to entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index d9be296864922536d3a0d0bd8bab65084c0dde05..2b3a82977d35a4b12c33590234a1be298e98fe64 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>SalesprojectForecast_entity</name>
- <title>${FORECAST_ENGLISH}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>${FORECAST_ENGLISH}</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 3ae166a2daa145fc2fef2facad81187e3f0a33fa..546ac28f0723dd82c0f8108d901e8195c75740fd 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>SalesprojectMember_entity</name>
- <title>${SALESPROJECT_MEMBER}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>${SALESPROJECT_MEMBER}</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
index 4a7a57b89fce8e923a69fa394174a717939b3e30..bcfc494174171799b764de5f3510eb27c18730d2 100644
--- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>SalesprojectMilestone_entity</name>
- <title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/titleProcess.js</titleProcess>
+ <title></title>
+ <contentTitleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/SalesprojectMilestone_entity/contentTitleProcess.js b/entity/SalesprojectMilestone_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..658e8105ef136f6e374f80363f1c1d0ace5fba7e
--- /dev/null
+++ b/entity/SalesprojectMilestone_entity/contentTitleProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+if (vars.exists("$field.TYPE") && vars.get("$field.TYPE"))
+{
+ result.string(translate.text("Milestones") + " " + translate.text(vars.get("$field.TYPE")));
+}
+else
+ result.string(translate.text("Milestones"));
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/titleProcess.js b/entity/SalesprojectMilestone_entity/titleProcess.js
deleted file mode 100644
index a5a099447859455db9fc077639edf59dc58e2105..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMilestone_entity/titleProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-if (vars.exists("$field.TYPE") && vars.get("$field.TYPE"))
-{
- result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text("Milestones") + " " + translate.text(vars.get("$field.TYPE"))));
-}
-else
- result.string(ContextUtils.prefixWithCurrentContextTitle(translate.text("Milestones")));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 365477a98c1a3a779fc631d3f71e7e5be9e8b13f..8134ba81bcca5b907a8ca4a790f6baea3520fd31 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>SalesprojectSource_entity</name>
- <title>Touchpoint</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Touchpoint</title>
+ <titlePlural>Touchpoints</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index cf5b6fcfaf15f937f6732b64d3ae57535c33a3d6..9ad20313a7f06aae3f80bf4d99689cf152e54da8 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Salesproject_entity</name>
- <title>Salesproject</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Salesproject</title>
+ <contentTitleProcess>%aditoprj%/entity/Salesproject_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Salesproject_entity/afterUiInit.js</afterUiInit>
<afterOperatingState>%aditoprj%/entity/Salesproject_entity/afterOperatingState.js</afterOperatingState>
<iconId>VAADIN:BOOK_DOLLAR</iconId>
- <titleProcess>%aditoprj%/entity/Salesproject_entity/titleProcess.js</titleProcess>
+ <titlePlural>Salesprojects</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -122,7 +123,6 @@
</entityField>
<entityConsumer>
<name>SalesprojectSources</name>
- <title>Touchpoints</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -139,7 +139,6 @@
</entityConsumer>
<entityConsumer>
<name>SalesprojectPhaseMilestones</name>
- <title>Milestone</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -156,7 +155,6 @@
</entityConsumer>
<entityConsumer>
<name>SalesprojectForecasts</name>
- <title>Forecast</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -173,7 +171,6 @@
</entityConsumer>
<entityConsumer>
<name>SalesprojectCompetitions</name>
- <title>Competition</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<selectionMode>MULTI</selectionMode>
<dependency>
@@ -191,7 +188,6 @@
</entityConsumer>
<entityConsumer>
<name>SalesprojectOffers</name>
- <title>Offer</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -208,7 +204,6 @@
</entityConsumer>
<entityConsumer>
<name>Activities</name>
- <title>Activity</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -235,7 +230,6 @@
</entityConsumer>
<entityConsumer>
<name>SalesprojectMembers</name>
- <title>${SALESPROJECT_MEMBER}</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -252,7 +246,6 @@
</entityConsumer>
<entityConsumer>
<name>SalesprojectClassifications</name>
- <title>Classification</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -277,7 +270,6 @@
</entityActionField>
<entityConsumer>
<name>Timetrackings</name>
- <title>Timetracking</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -304,7 +296,6 @@
</entityParameter>
<entityConsumer>
<name>ObjectRelations</name>
- <title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -326,7 +317,6 @@
</entityField>
<entityConsumer>
<name>Documents</name>
- <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -503,7 +493,6 @@
</entityActionField>
<entityConsumer>
<name>Tasks</name>
- <title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
@@ -561,12 +550,11 @@
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -581,11 +569,10 @@
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
- <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
@@ -599,6 +586,21 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Salesproject_entity/contentTitleProcess.js b/entity/Salesproject_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..96a0a030e216f22364464faa38814240f086e885
--- /dev/null
+++ b/entity/Salesproject_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.PROJECTTITLE"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/enddate/onValidation.js b/entity/Salesproject_entity/entityfields/enddate/onValidation.js
index 11c71f9e9c1f0bc9a2890ce460aafc7d5529a473..d1b85c480d185c06004adb867f43be8907e6b75f 100644
--- a/entity/Salesproject_entity/entityfields/enddate/onValidation.js
+++ b/entity/Salesproject_entity/entityfields/enddate/onValidation.js
@@ -1,7 +1,6 @@
import("system.result");
import("system.vars");
import("Date_lib");
-import("Util_lib");
import("Entity_lib");
var cEnd = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ENDDATE"));
diff --git a/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..97523412f94b7d77b72b9a0973be454ca2a0bf04
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.SALESPROJECTID"), tableNames: ["AB_ATTRIBUTERELATION", "ACTIVITY"]});
+res.push({id: vars.get("$field.SALESPROJECTID"), tableNames: ["SALESPROJECT"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/startdate/onValidation.js b/entity/Salesproject_entity/entityfields/startdate/onValidation.js
index 4e0411453d761b4184537f5ee680cc214e5a74d6..ab28629c8c2499b2993f38a7b7bda86ba83adf79 100644
--- a/entity/Salesproject_entity/entityfields/startdate/onValidation.js
+++ b/entity/Salesproject_entity/entityfields/startdate/onValidation.js
@@ -2,7 +2,6 @@ import("system.neon");
import("system.result");
import("system.vars");
import("Date_lib");
-import("Util_lib");
import("Entity_lib");
var cStart = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.STARTDATE"));
diff --git a/entity/Salesproject_entity/titleProcess.js b/entity/Salesproject_entity/titleProcess.js
deleted file mode 100644
index bcc2474490ec5415d723b0620ebb1458081b6b17..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.result");
-
-result.string(ContextUtils.prefixWithCurrentContextTitle(vars.get("$field.PROJECTTITLE")));
\ No newline at end of file
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index 7cb876bf356f6fd6f2eeca40702193835e82718b..1a6952dbd79999442dd11647beda50c10cbad8b5 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>SalutationDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/SalutationDistinct_entity/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/SalutationDistinct_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/SalutationDistinct_entity/titleProcess.js b/entity/SalutationDistinct_entity/contentTitleProcess.js
similarity index 100%
rename from entity/SalutationDistinct_entity/titleProcess.js
rename to entity/SalutationDistinct_entity/contentTitleProcess.js
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 107492518a372f4e724efbf90d1b399e637b9a25..69b4e230fa6ecb065c0759ff9ce9d962a4aec45e 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>SalutationTitleDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/SalutationTitleDistinct_entity/titleProcess.js b/entity/SalutationTitleDistinct_entity/contentTitleProcess.js
similarity index 100%
rename from entity/SalutationTitleDistinct_entity/titleProcess.js
rename to entity/SalutationTitleDistinct_entity/contentTitleProcess.js
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 6d9ca1082f0e301c65598b1ee6642124cbaab866..8b1ad9acba531ec507275b19311a7d0b3f344754 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Social_entity</name>
- <title>Social Media</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Social Media</title>
<entityFields>
<entityField>
<name>TWITTER_TIMELINE</name>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 3fa9ddecd54f544d8287a4d4a471cd61858a2b74..d48902059ecbe0de8d123bd2ab980b85ff709b55 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Stock_entity</name>
- <title>Stock</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Stock_entity/documentation.adoc</documentation>
+ <title>Stock</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 79772070ccca25e675bda8b5e769aed4f592d841..79e3c4d31bf77b37aa9ede304daf9e344f54d791 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>TaskLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Connection</title>
+ <titlePlural>Connections</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 5705fe5b4aad43f3add818d789234d4dffabfea5..a6bf61b99435f8e96cf8a68718ca1f654c3219b6 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Task_entity</name>
- <title>Task</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
+ <title>Task</title>
<afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:TASKS</iconId>
<iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
+ <titlePlural>Tasks</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -127,7 +128,6 @@
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
- <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -183,7 +183,6 @@
</entityConsumer>
<entityConsumer>
<name>ModuleTrees</name>
- <title>History</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -301,7 +300,6 @@
</entityConsumer>
<entityConsumer>
<name>Links</name>
- <title>Connections</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Task_entity/entityfields/priority_icon/colorProcess.js b/entity/Task_entity/entityfields/priority_icon/colorProcess.js
index 7908b6bec6d40dde4f4198ae7e71c9f704fe317e..f15523e7246f5c3c3c6336802201bbdc9c1ad65b 100644
--- a/entity/Task_entity/entityfields/priority_icon/colorProcess.js
+++ b/entity/Task_entity/entityfields/priority_icon/colorProcess.js
@@ -1,20 +1,21 @@
import("system.vars");
import("KeywordRegistry_basic");
import("system.result");
+import("system.neon");
switch(vars.getString("$field.PRIORITY"))
{
case $KeywordRegistry.taskPriority$none():
- result.string("$priority-none");
+ result.string(neon.PRIORITY_NONE_COLOR);
break;
case $KeywordRegistry.taskPriority$low():
- result.string("$priority-low");
+ result.string(neon.PRIORITY_LOW_COLOR);
break;
case $KeywordRegistry.taskPriority$medium():
- result.string("$priority-medium");
+ result.string(neon.PRIORITY_MEDIUM_COLOR);
break;
case $KeywordRegistry.taskPriority$high():
- result.string("$priority-high");
+ result.string(neon.PRIORITY_HIGH_COLOR);
break;
}
diff --git a/entity/Task_entity/entityfields/start_date/onValidation.js b/entity/Task_entity/entityfields/start_date/onValidation.js
index 4bad868ca52710b422022dd4583f0afde7b000bc..1953e078675ae172044ed6a888bdf05b846c131b 100644
--- a/entity/Task_entity/entityfields/start_date/onValidation.js
+++ b/entity/Task_entity/entityfields/start_date/onValidation.js
@@ -2,7 +2,6 @@ import("system.neon");
import("system.result");
import("system.vars");
import("Date_lib");
-import("Util_lib");
import("Entity_lib");
var cStart = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.START_DATE"));
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index f4d273c246a25a78760d00294c289254107eb54f..d13939a755dd53155ca08f4e793ebcbb7ddb01cf 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Timetracking_entity</name>
- <title>Timetracking</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Timetracking</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 0a8848c5a391adfc34a16da36aa3d9feed14efe6..2f8ab9d9f8efd8b691957875730d30abf726283a 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>Turnover_entity</name>
- <title>Turnover</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Turnover_entity/documentation.adoc</documentation>
+ <title>Turnover</title>
<iconId>VAADIN:CHART</iconId>
<recordContainer>jdito</recordContainer>
<entityFields>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index eb9b8a809e7519fb65e47d13d661cba82f2bb35c..8480e8fe42d5e96a9681e327c6b103b18415ce3f 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -3096,6 +3096,393 @@
<entry>
<key>Variable costs</key>
</entry>
+ <entry>
+ <key>Version number</key>
+ </entry>
+ <entry>
+ <key>Id value</key>
+ </entry>
+ <entry>
+ <key>Order executed</key>
+ </entry>
+ <entry>
+ <key>Liquibase</key>
+ </entry>
+ <entry>
+ <key>Number value</key>
+ </entry>
+ <entry>
+ <key>Author</key>
+ </entry>
+ <entry>
+ <key>Position Id</key>
+ </entry>
+ <entry>
+ <key>ISO3</key>
+ </entry>
+ <entry>
+ <key>ISO2</key>
+ </entry>
+ <entry>
+ <key>Communication Id</key>
+ </entry>
+ <entry>
+ <key>Attribute Id</key>
+ </entry>
+ <entry>
+ <key>Modification user</key>
+ </entry>
+ <entry>
+ <key>Headline</key>
+ </entry>
+ <entry>
+ <key>Salesorder Id</key>
+ </entry>
+ <entry>
+ <key>Salesproject milestone Id</key>
+ </entry>
+ <entry>
+ <key>Appointment Id</key>
+ </entry>
+ <entry>
+ <key>Locked</key>
+ </entry>
+ <entry>
+ <key>Timetracking Id</key>
+ </entry>
+ <entry>
+ <key>Salesorder date</key>
+ </entry>
+ <entry>
+ <key>Exec type</key>
+ </entry>
+ <entry>
+ <key>Date value</key>
+ </entry>
+ <entry>
+ <key>NUMBER VALUE</key>
+ </entry>
+ <entry>
+ <key>Salesproject forecast Id</key>
+ </entry>
+ <entry>
+ <key>ID</key>
+ </entry>
+ <entry>
+ <key>Keyword attribute relation Id</key>
+ </entry>
+ <entry>
+ <key>Minimal count</key>
+ </entry>
+ <entry>
+ <key>Id</key>
+ </entry>
+ <entry>
+ <key>Start date</key>
+ </entry>
+ <entry>
+ <key>Object 1 row Id</key>
+ </entry>
+ <entry>
+ <key>Side</key>
+ </entry>
+ <entry>
+ <key>Salesproject Id</key>
+ </entry>
+ <entry>
+ <key>Product Id</key>
+ </entry>
+ <entry>
+ <key>Sort</key>
+ </entry>
+ <entry>
+ <key>Relation Title</key>
+ </entry>
+ <entry>
+ <key>%0 \"%1\"</key>
+ </entry>
+ <entry>
+ <key>Maximal count</key>
+ </entry>
+ <entry>
+ <key>Data executed</key>
+ </entry>
+ <entry>
+ <key>Indexsearch</key>
+ </entry>
+ <entry>
+ <key>Appointment link Id</key>
+ </entry>
+ <entry>
+ <key>Relation Type</key>
+ </entry>
+ <entry>
+ <key>Salesproject member Id</key>
+ </entry>
+ <entry>
+ <key>Salesproject source Id</key>
+ </entry>
+ <entry>
+ <key>Item sort</key>
+ </entry>
+ <entry>
+ <key>%0 modified.</key>
+ </entry>
+ <entry>
+ <key>Contract Id</key>
+ </entry>
+ <entry>
+ <key>Int value</key>
+ </entry>
+ <entry>
+ <key>Object 2 row Id</key>
+ </entry>
+ <entry>
+ <key>Source tablename Id</key>
+ </entry>
+ <entry>
+ <key>Source tablename</key>
+ </entry>
+ <entry>
+ <key>Contact Id</key>
+ </entry>
+ <entry>
+ <key>Sales area</key>
+ </entry>
+ <entry>
+ <key>Parent Id</key>
+ </entry>
+ <entry>
+ <key>Task link Id</key>
+ </entry>
+ <entry>
+ <key>Protection level</key>
+ </entry>
+ <entry>
+ <key>Salesorder code</key>
+ </entry>
+ <entry>
+ <key>Class</key>
+ </entry>
+ <entry>
+ <key>BOOL VALUE</key>
+ </entry>
+ <entry>
+ <key>Keyword attribute Id</key>
+ </entry>
+ <entry>
+ <key>Log type</key>
+ </entry>
+ <entry>
+ <key>Object row Id</key>
+ </entry>
+ <entry>
+ <key>Labels</key>
+ </entry>
+ <entry>
+ <key>%0 deleted.</key>
+ </entry>
+ <entry>
+ <key>Salesproject competition Id</key>
+ </entry>
+ <entry>
+ <key>Activity Id</key>
+ </entry>
+ <entry>
+ <key>Person Id</key>
+ </entry>
+ <entry>
+ <key>Offer item Id</key>
+ </entry>
+ <entry>
+ <key>Offer Id</key>
+ </entry>
+ <entry>
+ <key>Name native</key>
+ </entry>
+ <entry>
+ <key>Flag</key>
+ </entry>
+ <entry>
+ <key>Address Id</key>
+ </entry>
+ <entry>
+ <key>Name latin</key>
+ </entry>
+ <entry>
+ <key>Destination Id</key>
+ </entry>
+ <entry>
+ <key>Sex</key>
+ </entry>
+ <entry>
+ <key>Product price Id</key>
+ </entry>
+ <entry>
+ <key>%0 added.</key>
+ </entry>
+ <entry>
+ <key>Object Relation Type</key>
+ </entry>
+ <entry>
+ <key>Entry date</key>
+ </entry>
+ <entry>
+ <key>Object relation type 2</key>
+ </entry>
+ <entry>
+ <key>Object relation type 1</key>
+ </entry>
+ <entry>
+ <key>Modification date</key>
+ </entry>
+ <entry>
+ <key>Object Type</key>
+ </entry>
+ <entry>
+ <key>%0 from \"%1\" to \"%2\"</key>
+ </entry>
+ <entry>
+ <key>MD5 Sum</key>
+ </entry>
+ <entry>
+ <key>Letter salutation</key>
+ </entry>
+ <entry>
+ <key>Lock granted</key>
+ </entry>
+ <entry>
+ <key>Required fields</key>
+ </entry>
+ <entry>
+ <key>Address addition</key>
+ </entry>
+ <entry>
+ <key>the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored</key>
+ </entry>
+ <entry>
+ <key>Attribute usage Id</key>
+ </entry>
+ <entry>
+ <key>LogHistory</key>
+ </entry>
+ <entry>
+ <key>Locked by</key>
+ </entry>
+ <entry>
+ <key>Desciption</key>
+ </entry>
+ <entry>
+ <key>Salutation Id</key>
+ </entry>
+ <entry>
+ <key>Comments</key>
+ </entry>
+ <entry>
+ <key>Task Id</key>
+ </entry>
+ <entry>
+ <key>Valid to</key>
+ </entry>
+ <entry>
+ <key>ZIP regex</key>
+ </entry>
+ <entry>
+ <key>Keyword entry Id</key>
+ </entry>
+ <entry>
+ <key>Salesproject classification Id</key>
+ </entry>
+ <entry>
+ <key>Stop costs</key>
+ </entry>
+ <entry>
+ <key>Contexts</key>
+ </entry>
+ <entry>
+ <key>Assigned to</key>
+ </entry>
+ <entry>
+ <key>%0 from \"%1\" to %2 \"%3\"</key>
+ </entry>
+ <entry>
+ <key>Date start</key>
+ </entry>
+ <entry>
+ <key>Cover Letter</key>
+ </entry>
+ <entry>
+ <key>Deployment Id</key>
+ </entry>
+ <entry>
+ <key>Address format</key>
+ </entry>
+ <entry>
+ <key>Activity link Id</key>
+ </entry>
+ <entry>
+ <key>Date end</key>
+ </entry>
+ <entry>
+ <key>Creation user</key>
+ </entry>
+ <entry>
+ <key>Unit Price</key>
+ </entry>
+ <entry>
+ <key>Object Id</key>
+ </entry>
+ <entry>
+ <key>Is active</key>
+ </entry>
+ <entry>
+ <key>Product relationship</key>
+ </entry>
+ <entry>
+ <key>Salesorder item Id</key>
+ </entry>
+ <entry>
+ <key>Char value</key>
+ </entry>
+ <entry>
+ <key>Attribute relation Id</key>
+ </entry>
+ <entry>
+ <key>Tag</key>
+ </entry>
+ <entry>
+ <key>Title suffix</key>
+ </entry>
+ <entry>
+ <key>Step costs</key>
+ </entry>
+ <entry>
+ <key>Min. Stock</key>
+ </entry>
+ <entry>
+ <key>User</key>
+ </entry>
+ <entry>
+ <key>Stock Id</key>
+ </entry>
+ <entry>
+ <key>Tablename</key>
+ </entry>
+ <entry>
+ <key>CHAR VALUE</key>
+ </entry>
+ <entry>
+ <key>Parent context</key>
+ </entry>
+ <entry>
+ <key>Organisation Id</key>
+ </entry>
+ <entry>
+ <key>Tablename Id</key>
+ </entry>
+ <entry>
+ <key>Offer date</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 9dd927040ab4ebee214023357e23086bab59c7ab..168003f9707b1651783cb212128fd28891d5903b 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3959,6 +3959,399 @@
<key>The max participants count has to be equal or greater than the count of the current participants!</key>
<value>Die maximale Teilnehmerzahl muss gleich oder größer der aktuellen Teilnehmerzahl sein!</value>
</entry>
+ <entry>
+ <key>Version number</key>
+ </entry>
+ <entry>
+ <key>Id value</key>
+ </entry>
+ <entry>
+ <key>Order executed</key>
+ </entry>
+ <entry>
+ <key>Liquibase</key>
+ </entry>
+ <entry>
+ <key>Number value</key>
+ </entry>
+ <entry>
+ <key>Author</key>
+ </entry>
+ <entry>
+ <key>Position Id</key>
+ </entry>
+ <entry>
+ <key>ISO3</key>
+ </entry>
+ <entry>
+ <key>ISO2</key>
+ </entry>
+ <entry>
+ <key>Communication Id</key>
+ </entry>
+ <entry>
+ <key>Attribute Id</key>
+ </entry>
+ <entry>
+ <key>Modification user</key>
+ </entry>
+ <entry>
+ <key>Headline</key>
+ </entry>
+ <entry>
+ <key>Salesorder Id</key>
+ </entry>
+ <entry>
+ <key>Salesproject milestone Id</key>
+ </entry>
+ <entry>
+ <key>Appointment Id</key>
+ </entry>
+ <entry>
+ <key>Locked</key>
+ </entry>
+ <entry>
+ <key>Timetracking Id</key>
+ </entry>
+ <entry>
+ <key>Salesorder date</key>
+ </entry>
+ <entry>
+ <key>Exec type</key>
+ </entry>
+ <entry>
+ <key>Date value</key>
+ </entry>
+ <entry>
+ <key>NUMBER VALUE</key>
+ </entry>
+ <entry>
+ <key>Salesproject forecast Id</key>
+ </entry>
+ <entry>
+ <key>ID</key>
+ </entry>
+ <entry>
+ <key>Keyword attribute relation Id</key>
+ </entry>
+ <entry>
+ <key>Minimal count</key>
+ </entry>
+ <entry>
+ <key>Id</key>
+ </entry>
+ <entry>
+ <key>Start date</key>
+ </entry>
+ <entry>
+ <key>Object 1 row Id</key>
+ </entry>
+ <entry>
+ <key>Side</key>
+ </entry>
+ <entry>
+ <key>Salesproject Id</key>
+ </entry>
+ <entry>
+ <key>Product Id</key>
+ </entry>
+ <entry>
+ <key>Sort</key>
+ </entry>
+ <entry>
+ <key>Relation Title</key>
+ </entry>
+ <entry>
+ <key>%0 \"%1\"</key>
+ </entry>
+ <entry>
+ <key>Maximal count</key>
+ </entry>
+ <entry>
+ <key>Data executed</key>
+ </entry>
+ <entry>
+ <key>Indexsearch</key>
+ </entry>
+ <entry>
+ <key>Appointment link Id</key>
+ </entry>
+ <entry>
+ <key>Relation Type</key>
+ </entry>
+ <entry>
+ <key>Salesproject member Id</key>
+ </entry>
+ <entry>
+ <key>Salesproject source Id</key>
+ </entry>
+ <entry>
+ <key>Item sort</key>
+ </entry>
+ <entry>
+ <key>%0 modified.</key>
+ <value>%0 geändert.</value>
+ </entry>
+ <entry>
+ <key>Contract Id</key>
+ </entry>
+ <entry>
+ <key>Int value</key>
+ </entry>
+ <entry>
+ <key>Object 2 row Id</key>
+ </entry>
+ <entry>
+ <key>Source tablename Id</key>
+ </entry>
+ <entry>
+ <key>Source tablename</key>
+ </entry>
+ <entry>
+ <key>Contact Id</key>
+ </entry>
+ <entry>
+ <key>Sales area</key>
+ </entry>
+ <entry>
+ <key>Parent Id</key>
+ </entry>
+ <entry>
+ <key>Task link Id</key>
+ </entry>
+ <entry>
+ <key>Protection level</key>
+ </entry>
+ <entry>
+ <key>Salesorder code</key>
+ </entry>
+ <entry>
+ <key>Class</key>
+ </entry>
+ <entry>
+ <key>BOOL VALUE</key>
+ </entry>
+ <entry>
+ <key>Keyword attribute Id</key>
+ </entry>
+ <entry>
+ <key>Log type</key>
+ </entry>
+ <entry>
+ <key>Object row Id</key>
+ </entry>
+ <entry>
+ <key>Labels</key>
+ </entry>
+ <entry>
+ <key>%0 deleted.</key>
+ <value>%0 gelöscht.</value>
+ </entry>
+ <entry>
+ <key>Salesproject competition Id</key>
+ </entry>
+ <entry>
+ <key>Activity Id</key>
+ </entry>
+ <entry>
+ <key>Person Id</key>
+ </entry>
+ <entry>
+ <key>Offer item Id</key>
+ </entry>
+ <entry>
+ <key>Offer Id</key>
+ </entry>
+ <entry>
+ <key>Name native</key>
+ </entry>
+ <entry>
+ <key>Flag</key>
+ </entry>
+ <entry>
+ <key>Address Id</key>
+ </entry>
+ <entry>
+ <key>Name latin</key>
+ </entry>
+ <entry>
+ <key>Destination Id</key>
+ </entry>
+ <entry>
+ <key>Sex</key>
+ </entry>
+ <entry>
+ <key>Product price Id</key>
+ </entry>
+ <entry>
+ <key>%0 added.</key>
+ <value>%0 eingefügt.</value>
+ </entry>
+ <entry>
+ <key>Object Relation Type</key>
+ </entry>
+ <entry>
+ <key>Entry date</key>
+ </entry>
+ <entry>
+ <key>Object relation type 2</key>
+ </entry>
+ <entry>
+ <key>Object relation type 1</key>
+ </entry>
+ <entry>
+ <key>Modification date</key>
+ </entry>
+ <entry>
+ <key>Object Type</key>
+ </entry>
+ <entry>
+ <key>%0 from \"%1\" to \"%2\"</key>
+ <value>%0 von \"%1\" auf \"%2\"</value>
+ </entry>
+ <entry>
+ <key>MD5 Sum</key>
+ </entry>
+ <entry>
+ <key>Letter salutation</key>
+ </entry>
+ <entry>
+ <key>Lock granted</key>
+ </entry>
+ <entry>
+ <key>Required fields</key>
+ </entry>
+ <entry>
+ <key>Address addition</key>
+ </entry>
+ <entry>
+ <key>the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored</key>
+ </entry>
+ <entry>
+ <key>Attribute usage Id</key>
+ </entry>
+ <entry>
+ <key>LogHistory</key>
+ </entry>
+ <entry>
+ <key>Locked by</key>
+ </entry>
+ <entry>
+ <key>Desciption</key>
+ </entry>
+ <entry>
+ <key>Salutation Id</key>
+ </entry>
+ <entry>
+ <key>Comments</key>
+ </entry>
+ <entry>
+ <key>Task Id</key>
+ </entry>
+ <entry>
+ <key>Valid to</key>
+ </entry>
+ <entry>
+ <key>ZIP regex</key>
+ </entry>
+ <entry>
+ <key>Keyword entry Id</key>
+ </entry>
+ <entry>
+ <key>Salesproject classification Id</key>
+ </entry>
+ <entry>
+ <key>Stop costs</key>
+ </entry>
+ <entry>
+ <key>Contexts</key>
+ </entry>
+ <entry>
+ <key>Assigned to</key>
+ </entry>
+ <entry>
+ <key>%0 from \"%1\" to %2 \"%3\"</key>
+ <value>%0 von \"%1\" auf %2 \"%3\"</value>
+ </entry>
+ <entry>
+ <key>Date start</key>
+ </entry>
+ <entry>
+ <key>Cover Letter</key>
+ </entry>
+ <entry>
+ <key>Deployment Id</key>
+ </entry>
+ <entry>
+ <key>Address format</key>
+ </entry>
+ <entry>
+ <key>Activity link Id</key>
+ </entry>
+ <entry>
+ <key>Date end</key>
+ </entry>
+ <entry>
+ <key>Creation user</key>
+ </entry>
+ <entry>
+ <key>Unit Price</key>
+ </entry>
+ <entry>
+ <key>Object Id</key>
+ </entry>
+ <entry>
+ <key>Is active</key>
+ </entry>
+ <entry>
+ <key>Product relationship</key>
+ </entry>
+ <entry>
+ <key>Salesorder item Id</key>
+ </entry>
+ <entry>
+ <key>Char value</key>
+ </entry>
+ <entry>
+ <key>Attribute relation Id</key>
+ </entry>
+ <entry>
+ <key>Tag</key>
+ </entry>
+ <entry>
+ <key>Title suffix</key>
+ </entry>
+ <entry>
+ <key>Step costs</key>
+ </entry>
+ <entry>
+ <key>Min. Stock</key>
+ </entry>
+ <entry>
+ <key>User</key>
+ <value>Benutzer</value>
+ </entry>
+ <entry>
+ <key>Stock Id</key>
+ </entry>
+ <entry>
+ <key>Tablename</key>
+ </entry>
+ <entry>
+ <key>CHAR VALUE</key>
+ </entry>
+ <entry>
+ <key>Parent context</key>
+ </entry>
+ <entry>
+ <key>Organisation Id</key>
+ </entry>
+ <entry>
+ <key>Tablename Id</key>
+ </entry>
+ <entry>
+ <key>Offer date</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 d199b4f347d3ce2e09c2993a2c6a944dc1b29832..bd0432969da8d0c2a941fa99df4927fb0ff533e7 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -697,6 +697,7 @@
</entry>
<entry>
<key>dd.MM.yyyy</key>
+ <value>MM/dd/yyyy</value>
</entry>
<entry>
<key>no valid mail-address format</key>
@@ -3130,6 +3131,393 @@
<entry>
<key>Variable costs</key>
</entry>
+ <entry>
+ <key>Version number</key>
+ </entry>
+ <entry>
+ <key>Id value</key>
+ </entry>
+ <entry>
+ <key>Order executed</key>
+ </entry>
+ <entry>
+ <key>Liquibase</key>
+ </entry>
+ <entry>
+ <key>Number value</key>
+ </entry>
+ <entry>
+ <key>Author</key>
+ </entry>
+ <entry>
+ <key>Position Id</key>
+ </entry>
+ <entry>
+ <key>ISO3</key>
+ </entry>
+ <entry>
+ <key>ISO2</key>
+ </entry>
+ <entry>
+ <key>Communication Id</key>
+ </entry>
+ <entry>
+ <key>Attribute Id</key>
+ </entry>
+ <entry>
+ <key>Modification user</key>
+ </entry>
+ <entry>
+ <key>Headline</key>
+ </entry>
+ <entry>
+ <key>Salesorder Id</key>
+ </entry>
+ <entry>
+ <key>Salesproject milestone Id</key>
+ </entry>
+ <entry>
+ <key>Appointment Id</key>
+ </entry>
+ <entry>
+ <key>Locked</key>
+ </entry>
+ <entry>
+ <key>Timetracking Id</key>
+ </entry>
+ <entry>
+ <key>Salesorder date</key>
+ </entry>
+ <entry>
+ <key>Exec type</key>
+ </entry>
+ <entry>
+ <key>Date value</key>
+ </entry>
+ <entry>
+ <key>NUMBER VALUE</key>
+ </entry>
+ <entry>
+ <key>Salesproject forecast Id</key>
+ </entry>
+ <entry>
+ <key>ID</key>
+ </entry>
+ <entry>
+ <key>Keyword attribute relation Id</key>
+ </entry>
+ <entry>
+ <key>Minimal count</key>
+ </entry>
+ <entry>
+ <key>Id</key>
+ </entry>
+ <entry>
+ <key>Start date</key>
+ </entry>
+ <entry>
+ <key>Object 1 row Id</key>
+ </entry>
+ <entry>
+ <key>Side</key>
+ </entry>
+ <entry>
+ <key>Salesproject Id</key>
+ </entry>
+ <entry>
+ <key>Product Id</key>
+ </entry>
+ <entry>
+ <key>Sort</key>
+ </entry>
+ <entry>
+ <key>Relation Title</key>
+ </entry>
+ <entry>
+ <key>%0 \"%1\"</key>
+ </entry>
+ <entry>
+ <key>Maximal count</key>
+ </entry>
+ <entry>
+ <key>Data executed</key>
+ </entry>
+ <entry>
+ <key>Indexsearch</key>
+ </entry>
+ <entry>
+ <key>Appointment link Id</key>
+ </entry>
+ <entry>
+ <key>Relation Type</key>
+ </entry>
+ <entry>
+ <key>Salesproject member Id</key>
+ </entry>
+ <entry>
+ <key>Salesproject source Id</key>
+ </entry>
+ <entry>
+ <key>Item sort</key>
+ </entry>
+ <entry>
+ <key>%0 modified.</key>
+ </entry>
+ <entry>
+ <key>Contract Id</key>
+ </entry>
+ <entry>
+ <key>Int value</key>
+ </entry>
+ <entry>
+ <key>Object 2 row Id</key>
+ </entry>
+ <entry>
+ <key>Source tablename Id</key>
+ </entry>
+ <entry>
+ <key>Source tablename</key>
+ </entry>
+ <entry>
+ <key>Contact Id</key>
+ </entry>
+ <entry>
+ <key>Sales area</key>
+ </entry>
+ <entry>
+ <key>Parent Id</key>
+ </entry>
+ <entry>
+ <key>Task link Id</key>
+ </entry>
+ <entry>
+ <key>Protection level</key>
+ </entry>
+ <entry>
+ <key>Salesorder code</key>
+ </entry>
+ <entry>
+ <key>Class</key>
+ </entry>
+ <entry>
+ <key>BOOL VALUE</key>
+ </entry>
+ <entry>
+ <key>Keyword attribute Id</key>
+ </entry>
+ <entry>
+ <key>Log type</key>
+ </entry>
+ <entry>
+ <key>Object row Id</key>
+ </entry>
+ <entry>
+ <key>Labels</key>
+ </entry>
+ <entry>
+ <key>%0 deleted.</key>
+ </entry>
+ <entry>
+ <key>Salesproject competition Id</key>
+ </entry>
+ <entry>
+ <key>Activity Id</key>
+ </entry>
+ <entry>
+ <key>Person Id</key>
+ </entry>
+ <entry>
+ <key>Offer item Id</key>
+ </entry>
+ <entry>
+ <key>Offer Id</key>
+ </entry>
+ <entry>
+ <key>Name native</key>
+ </entry>
+ <entry>
+ <key>Flag</key>
+ </entry>
+ <entry>
+ <key>Address Id</key>
+ </entry>
+ <entry>
+ <key>Name latin</key>
+ </entry>
+ <entry>
+ <key>Destination Id</key>
+ </entry>
+ <entry>
+ <key>Sex</key>
+ </entry>
+ <entry>
+ <key>Product price Id</key>
+ </entry>
+ <entry>
+ <key>%0 added.</key>
+ </entry>
+ <entry>
+ <key>Object Relation Type</key>
+ </entry>
+ <entry>
+ <key>Entry date</key>
+ </entry>
+ <entry>
+ <key>Object relation type 2</key>
+ </entry>
+ <entry>
+ <key>Object relation type 1</key>
+ </entry>
+ <entry>
+ <key>Modification date</key>
+ </entry>
+ <entry>
+ <key>Object Type</key>
+ </entry>
+ <entry>
+ <key>%0 from \"%1\" to \"%2\"</key>
+ </entry>
+ <entry>
+ <key>MD5 Sum</key>
+ </entry>
+ <entry>
+ <key>Letter salutation</key>
+ </entry>
+ <entry>
+ <key>Lock granted</key>
+ </entry>
+ <entry>
+ <key>Required fields</key>
+ </entry>
+ <entry>
+ <key>Address addition</key>
+ </entry>
+ <entry>
+ <key>the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored</key>
+ </entry>
+ <entry>
+ <key>Attribute usage Id</key>
+ </entry>
+ <entry>
+ <key>LogHistory</key>
+ </entry>
+ <entry>
+ <key>Locked by</key>
+ </entry>
+ <entry>
+ <key>Desciption</key>
+ </entry>
+ <entry>
+ <key>Salutation Id</key>
+ </entry>
+ <entry>
+ <key>Comments</key>
+ </entry>
+ <entry>
+ <key>Task Id</key>
+ </entry>
+ <entry>
+ <key>Valid to</key>
+ </entry>
+ <entry>
+ <key>ZIP regex</key>
+ </entry>
+ <entry>
+ <key>Keyword entry Id</key>
+ </entry>
+ <entry>
+ <key>Salesproject classification Id</key>
+ </entry>
+ <entry>
+ <key>Stop costs</key>
+ </entry>
+ <entry>
+ <key>Contexts</key>
+ </entry>
+ <entry>
+ <key>Assigned to</key>
+ </entry>
+ <entry>
+ <key>%0 from \"%1\" to %2 \"%3\"</key>
+ </entry>
+ <entry>
+ <key>Date start</key>
+ </entry>
+ <entry>
+ <key>Cover Letter</key>
+ </entry>
+ <entry>
+ <key>Deployment Id</key>
+ </entry>
+ <entry>
+ <key>Address format</key>
+ </entry>
+ <entry>
+ <key>Activity link Id</key>
+ </entry>
+ <entry>
+ <key>Date end</key>
+ </entry>
+ <entry>
+ <key>Creation user</key>
+ </entry>
+ <entry>
+ <key>Unit Price</key>
+ </entry>
+ <entry>
+ <key>Object Id</key>
+ </entry>
+ <entry>
+ <key>Is active</key>
+ </entry>
+ <entry>
+ <key>Product relationship</key>
+ </entry>
+ <entry>
+ <key>Salesorder item Id</key>
+ </entry>
+ <entry>
+ <key>Char value</key>
+ </entry>
+ <entry>
+ <key>Attribute relation Id</key>
+ </entry>
+ <entry>
+ <key>Tag</key>
+ </entry>
+ <entry>
+ <key>Title suffix</key>
+ </entry>
+ <entry>
+ <key>Step costs</key>
+ </entry>
+ <entry>
+ <key>Min. Stock</key>
+ </entry>
+ <entry>
+ <key>User</key>
+ </entry>
+ <entry>
+ <key>Stock Id</key>
+ </entry>
+ <entry>
+ <key>Tablename</key>
+ </entry>
+ <entry>
+ <key>CHAR VALUE</key>
+ </entry>
+ <entry>
+ <key>Parent context</key>
+ </entry>
+ <entry>
+ <key>Organisation Id</key>
+ </entry>
+ <entry>
+ <key>Tablename Id</key>
+ </entry>
+ <entry>
+ <key>Offer date</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/AttributeRelation/AttributeRelation.aod b/neonContext/AttributeRelation/AttributeRelation.aod
index f6365a27cf00e2c7f5ae99430228cd810cbd80a5..6a64d2f7d6dd15ed63f866b1d6f9f9e732042bba 100644
--- a/neonContext/AttributeRelation/AttributeRelation.aod
+++ b/neonContext/AttributeRelation/AttributeRelation.aod
@@ -1,16 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>AttributeRelation</name>
+ <name>AttributeRelationTree</name>
<title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <editview>AttributeRelationTreeEdit_view</editview>
<entity>AttributeRelation_entity</entity>
<references>
<neonViewReference>
- <name>d2970ead-0da7-4fad-9f82-0c02fe85fe2c</name>
- <view>AttributeRelationEdit_view</view>
+ <name>55f89863-72b0-4179-8494-b1e320d79de9</name>
+ <view>AttributeRelationTree_view</view>
</neonViewReference>
<neonViewReference>
- <name>e23b445d-12eb-400c-9153-af6b026654e6</name>
+ <name>591d27d7-e963-4ff0-9d82-2e24b18e6b5c</name>
+ <view>AttributeRelationTreeEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5628f945-6b08-494c-9e7c-ca1c67517b12</name>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b50638d0-30ec-4166-80c0-ab6d0f2180a1</name>
<view>AttributeRelationPreviewList</view>
</neonViewReference>
</references>
diff --git a/neonContext/AttributeRelationTree/AttributeRelationTree.aod b/neonContext/AttributeRelationTree/AttributeRelationTree.aod
deleted file mode 100644
index 73c73bdd8cef6f24e2de33935f66fd29e1201559..0000000000000000000000000000000000000000
--- a/neonContext/AttributeRelationTree/AttributeRelationTree.aod
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>AttributeRelationTree</name>
- <title>Attributes</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <editview>AttributeRelationTreeEdit_view</editview>
- <entity>AttributeRelationTree_entity</entity>
- <references>
- <neonViewReference>
- <name>55f89863-72b0-4179-8494-b1e320d79de9</name>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>591d27d7-e963-4ff0-9d82-2e24b18e6b5c</name>
- <view>AttributeRelationTreeEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonContext/LogHistory/LogHistory.aod b/neonContext/LogHistory/LogHistory.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f2c9352b523d2250c208dee11ee4dfaffc4209fb
--- /dev/null
+++ b/neonContext/LogHistory/LogHistory.aod
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>LogHistory</name>
+ <title>LogHistory</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>LogHistoryFilter_view</filterview>
+ <entity>LogHistory_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>76df2f61-4176-4648-81c7-33da90b76967</name>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod
index 1a13f58ed9080d11516f1fa978b3c99aecda5eb0..5397d31aab09aeb55e4e43406fbbfb13614bcd16 100644
--- a/neonView/ActivityEdit_view/ActivityEdit_view.aod
+++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod
@@ -50,7 +50,7 @@
<neonViewReference>
<name>7fcf9c09-189a-47b7-a171-9975676ed704</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod b/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
similarity index 71%
rename from neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
rename to neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
index a4b17b338e2a385c4383110d588d4df944b965d0..b3f7e06aafeef4f2eac6dc03a9d1c3b864eb7836 100644
--- a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
+++ b/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
@@ -1,24 +1,24 @@
<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>AttributeRelationEdit_view</name>
+ <name>AttributeRelationMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <noneLayout>
+ <boxLayout>
<name>layout</name>
- </noneLayout>
+ </boxLayout>
</layout>
<children>
<genericMultipleViewTemplate>
- <name>MultipleEdit</name>
+ <name>GenericMultiple</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>3da856c1-6a5b-4fc3-aa41-0865b331a5e4</name>
+ <name>5ccc9c8e-baee-4506-b4cc-3797be0eb237</name>
<entityField>AB_ATTRIBUTE_ID</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>04dda499-d970-41d1-a524-5e354c0d2bfd</name>
- <entityField>valueProxy</entityField>
+ <name>ada9c77a-f37b-4021-a01a-a06edd75cb25</name>
+ <entityField>VALUE</entityField>
</neonTableColumn>
</columns>
</genericMultipleViewTemplate>
diff --git a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
index 70932bf3595460a7e375d16a4c2fae51f15798b7..3908b6781bff3666e67947c28dad792f585b8c29 100644
--- a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
+++ b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
@@ -13,12 +13,12 @@
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>ca2fb22d-2987-443d-8e69-fccaba68e0c5</name>
+ <name>18c6e169-bd6e-448a-b028-c43f2a6a2973</name>
<entityField>AB_ATTRIBUTE_ID</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>a4661c55-6e51-4884-b460-0ef1dca7c5f7</name>
- <entityField>valueProxy</entityField>
+ <name>ec5ceac7-a2d4-4912-b04b-adc83d3e9589</name>
+ <entityField>VALUE</entityField>
</neonTableColumn>
</columns>
</titledListViewTemplate>
diff --git a/neonView/ContractEdit_view/ContractEdit_view.aod b/neonView/ContractEdit_view/ContractEdit_view.aod
index 21e04e53a2be56f8e8c2d0a5a6b3f0b5bdbec3ef..305051621158363a459290695f4bccb398ec38e1 100644
--- a/neonView/ContractEdit_view/ContractEdit_view.aod
+++ b/neonView/ContractEdit_view/ContractEdit_view.aod
@@ -54,7 +54,7 @@
<neonViewReference>
<name>49eafd04-4d72-4a11-8818-97407e0fe154</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ContractMain_view/ContractMain_view.aod b/neonView/ContractMain_view/ContractMain_view.aod
index dd52050bf2edb9d1e3ed7d972a4006db611390c2..9f2f8dd29b29aca3f1d20cc4e74a543452d82d63 100644
--- a/neonView/ContractMain_view/ContractMain_view.aod
+++ b/neonView/ContractMain_view/ContractMain_view.aod
@@ -29,15 +29,15 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>5539ca52-abbc-4f47-a4b5-c13c9628a16b</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>940f0dca-aee3-4af6-ae50-9334964ce414</name>
<entityField>AttributeTree</entityField>
<view>AttributeRelationTree_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>fa15c239-7bf6-4ec6-8f62-49e83d7f2d2c</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
index 766d45a551b95b7988fd3c119c450145322a455c..884520ac52fc84868b8337f68b8ee571b17ab20b 100644
--- a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
+++ b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
@@ -1,69 +1,69 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>EmployeeEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Generic</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
- <entityField>ISACTIVE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7d36467f-8b79-4647-b8e5-5759bdbf37a7</name>
- <entityField>FIRSTNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>00a2dedb-67f5-4662-b053-bf841b30e365</name>
- <entityField>LASTNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9c030b62-bf17-4be1-bcc6-87b304a618c0</name>
- <entityField>TITLE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>6155e6b7-ee2c-45b4-87f5-9e506ffc5775</name>
- <entityField>EMAIL_ADDRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>6abf045b-88f9-40c9-a009-f85538d6fe23</name>
- <entityField>DEPARTMENT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8cffaf75-f2dc-42c5-95d7-1ce1e4927d8a</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4ad9c1aa-37a9-46f9-a566-94e5be5c2a7f</name>
- <entityField>PASSWORD</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>5381db3a-762d-439a-b41b-e4e67edc2099</name>
- <entityField>CONFIRM_PASSWORD</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>af8112a3-78d3-436f-b665-ebce595a7c24</name>
- <entityField>EmployeeRoles</entityField>
- <view>EmployeeRoleEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>07e77840-e140-4ba0-ac09-d8e10e7d88a2</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>EmployeeEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Generic</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7d36467f-8b79-4647-b8e5-5759bdbf37a7</name>
+ <entityField>FIRSTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>00a2dedb-67f5-4662-b053-bf841b30e365</name>
+ <entityField>LASTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9c030b62-bf17-4be1-bcc6-87b304a618c0</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6155e6b7-ee2c-45b4-87f5-9e506ffc5775</name>
+ <entityField>EMAIL_ADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6abf045b-88f9-40c9-a009-f85538d6fe23</name>
+ <entityField>DEPARTMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8cffaf75-f2dc-42c5-95d7-1ce1e4927d8a</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4ad9c1aa-37a9-46f9-a566-94e5be5c2a7f</name>
+ <entityField>PASSWORD</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5381db3a-762d-439a-b41b-e4e67edc2099</name>
+ <entityField>CONFIRM_PASSWORD</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>af8112a3-78d3-436f-b665-ebce595a7c24</name>
+ <entityField>EmployeeRoles</entityField>
+ <view>EmployeeRoleEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>07e77840-e140-4ba0-ac09-d8e10e7d88a2</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod b/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6b0d403e7a8e643fbfebf6e815c81d0eaa9f2846
--- /dev/null
+++ b/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
@@ -0,0 +1,41 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>LogHistoryFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>LogHistoryTable</name>
+ <hideContentSearch v="true" />
+ <isEditable v="false" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>97886728-fbfe-4d32-b5b4-7dce443e1e2c</name>
+ <entityField>DATE_NEW</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2647a81d-2a50-433a-8dc9-f701a60e10e8</name>
+ <entityField>USER_NEW</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>02a31f8a-2f91-4364-9d2a-898c4b587afa</name>
+ <entityField>DESCRIPTION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ <timelineViewTemplate>
+ <name>LogHistoryTimeLine</name>
+ <dateField>DATE_NEW</dateField>
+ <titleField>USER_NEW</titleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <iconIdField>#IMAGE</iconIdField>
+ <entityField>#ENTITY</entityField>
+ </timelineViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index ba2428898be40760f5ee4785e95fc00e47a95725..8dae75fcec804d05780df05043f1ccc621f6a26b 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -73,7 +73,7 @@
<neonViewReference>
<name>52f93604-4ec3-427f-b220-27ab63a30560</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index 47f2a91194206929a0f2c663bb747f096a09e755..fbc90aac96fcf671f11fc34626716590116430b7 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -44,5 +44,10 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>d79a0304-4106-4749-b2e1-c5ba005b4448</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index 23999712d4bdbc25fa2fb3171d39e082a6744284..a0fe44f27fcbe8f9e3505e0952877a206b9dbc1c 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -13,6 +13,7 @@
<name>Header</name>
<iconField>IMAGE</iconField>
<titleField>ITEMNAME</titleField>
+ <subtitleField>PRODUCT_ID</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index 2132b516032ca81b2c1e714ead5d08f216cf47d5..b5c58b6fe86174e241216f40a77120f5692fbe20 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -57,7 +57,7 @@
<neonViewReference>
<name>72e2cb25-23e0-4f52-87a3-7c1bd80e99ec</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index bc76e90e0617ea97e8df8b7e2a17aa0555055a0e..540b3053f6b23d18eb9e8e7d1558140feaa8c9ed 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -44,5 +44,10 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>b0dea506-7dd9-4de9-9ebe-ecad9965c300</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
index 274866d3cfb2339102985a8bceb40b21596ec16b..080b29e16ea4781a2c803798dcee3674b0ed54b0 100644
--- a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
+++ b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
@@ -53,9 +53,9 @@
<view>CommunicationMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
- <name>2037ef93-6719-49af-9352-9ca3c03d6972</name>
+ <name>2114d459-851a-4ead-b3ec-a81ec78af607</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 379f16e6021e69e9690f16baf62a95468a27c29d..5d85b9c313e15a741d70ca865e3b199c4999d5cd 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -55,5 +55,10 @@
<entityField>AttributeTree</entityField>
<view>AttributeRelationTree_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonEdit_view/PersonEdit_view.aod b/neonView/PersonEdit_view/PersonEdit_view.aod
index 78930188971155046864647b3f5ea60c6e1d3186..4980ebdd11c47b41d9e8ce026624767dc0eb6463 100644
--- a/neonView/PersonEdit_view/PersonEdit_view.aod
+++ b/neonView/PersonEdit_view/PersonEdit_view.aod
@@ -84,7 +84,7 @@
<neonViewReference>
<name>520f3056-2a24-4469-a86f-76ba80090829</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index cf6a7e599ef4476efec0ca6ae8b110e64d24732c..c839e4c1dfff64a863a8d0c23a7b39dc6dba8a11 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -49,5 +49,10 @@
<entityField>OtherContacts</entityField>
<view>ContactList_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index 04a5f765b82c18a34e08728c52168bdd8f3bdd55..7aa52918d62670c48297efd7a109e7bf40f31438 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -62,7 +62,7 @@
<neonViewReference>
<name>34659538-e8a5-4f76-9710-a322548885ef</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index 4ac236a7f2e11b1838d3b1cb44e173e0693fd858..bea0ee6a47b6f8c20c50789f9874a69f0e250e27 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -49,5 +49,10 @@
<entityField>AttributeTree</entityField>
<view>AttributeRelationTree_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>0faf6a9e-b1f3-452d-b7fd-d0c9e3fc25f8</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
index c047336f190676a4a78f522967c83665db265246..b259c9d69e6cd164d272bb9e7da686c512c4f89e 100644
--- a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
+++ b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
@@ -65,7 +65,7 @@
<neonViewReference>
<name>fc97f8c8-ffd0-4d67-b331-eab37ef1dc2b</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 649798e53651fcf3339727f5098a61c702bbebc9..991ec53deb1f9383a911cb9fe97bd98584bb5d77 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -69,5 +69,10 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>6ed5fc92-1056-418f-a0b7-3d55414efe3a</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/process/Address_lib/process.js b/process/Address_lib/process.js
index 5827d6bbe88171d09a90f2236fd8bafbdec0cc98..072f226e175d506f8ba24ba06c398cda77f54792 100644
--- a/process/Address_lib/process.js
+++ b/process/Address_lib/process.js
@@ -383,33 +383,53 @@ function _getCountryName(pCountryCode)
*/
function _formatAddrData( pAddrData, pFormat, pCountry )
{
- var placeholder = [["address_street", 1],["buildingno", 2],["zip", 3],["city", 4],["district", 8],["region", 9],["state", 10],["organisation_name", 15], //0-7
- ["firstname", 16],["middlename", 17],["lastname", 18],["saluation", 19],["title", 20], ["suffix", 21], ["salutation_name", 23],["letter salutation", 24], ["country", 25]]; //8-16
- var as = pAddrData[26];
- if ( pFormat != "" && pFormat != undefined) as = pFormat;
- as = _getFormatMapping(as, pAddrData, pCountry);
+ var placeholerInfo = {
+ "street": {dataPosition: 1},
+ "buildingno": {dataPosition: 2},
+ "zip": {dataPosition: 3},
+ "city": {dataPosition: 4},
+ "district": {dataPosition: 8},
+ "region": {dataPosition: 9},
+ "state": {dataPosition: 10},
+ "firstname": {dataPosition: 16},
+ "middlename": {dataPosition: 17},
+ "lastname": {dataPosition: 18},
+ "saluation": {dataPosition: 19},
+ "title": {dataPosition: 20},
+ "suffix": {dataPosition: 21},
+ "country": {dataPosition: 25},
+ "organisation name": {dataPosition: 15},
+ "salutation_name": {dataPosition: 23},
+ "letter salutation": {dataPosition: 24}
+ };
+
+ var format = pFormat || pAddrData[26];
+ format = _mapFormatPlaceholderTitles(format, pAddrData, pCountry);
- for( var y = 0; y < placeholder.length; y++ )
- {
- as = as.replace(new RegExp(placeholder[y][0], "g"), pAddrData[placeholder[y][1]]);
- if (pAddrData[placeholder[y][1]] != undefined ) {
- as = as.replace(new RegExp(placeholder[y][0].toUpperCase(), "g"), pAddrData[placeholder[y][1]].toUpperCase());
- }
+ var res = format;
+ for (var placeholder in placeholerInfo)
+ {
+ var currentAddrData = pAddrData[placeholerInfo[placeholder].dataPosition];
+ if (currentAddrData != undefined)
+ {
+ res = res.replace(new RegExp("{" + placeholder + "}", "g"), currentAddrData);
+ res = res.replace(new RegExp("{" + placeholder.toUpperCase() + "}", "g"), currentAddrData.toUpperCase());
+ }
}
-
- as = as.replace(/^\n/, ""); // CR am Anfang entfernen;
- as = as.replace(/ /g, " "); // doppelte leerzeichen entfernen
- as = as.replace(/\\n/ig, "\n"); // newline marker ersetzen
- as = as.replace(/ *\n */g, "\n");// leerzeichen am ende und Anfang entfernen
- as = as.replace(/\s(?=\s)/g, ""); // leerzeilen rauswerfen
- return as;
+
+ res = res.replace(/^\n/, ""); // CR am Anfang entfernen;
+ res = res.replace(/ /g, " "); // doppelte leerzeichen entfernen
+ res = res.replace(/\\n/ig, "\n"); // newline marker ersetzen
+ res = res.replace(/ *\n */g, "\n");// leerzeichen am ende und Anfang entfernen
+ res = res.replace(/\s(?=\s)/g, ""); // leerzeilen rauswerfen
+ return res;
}
/*
* returns the new format
*
* @param {String [[]]} pAddrData req Daten
-* @param {String} as req the format string
+* @param {String} pFormat req the format string
* @param {boolean} pCountry if the country should be displayed
*
* @return {String} new formate
@@ -423,23 +443,31 @@ S – Administrative area - state
Z – Zip or postal code - zip
X – Sorting code - not available
*/
-function _getFormatMapping(as, pAddrData, pCountry) {
- as = as.replace(new RegExp("%N", "g"), "salutation_name");
- as = as.replace(new RegExp("%A", "g"), "address_street buildingno");
- as = as.replace(new RegExp("%C", "g"), "city");
- as = as.replace(new RegExp("%S", "g"), "state");
- as = as.replace(new RegExp("%Z", "g"), "zip");
- as = as.replace(new RegExp("%O", "g"), "organisation_name");
- as = as.replace(new RegExp("%X", "g"), "");
- as = as.replace(new RegExp("%n", "g"), "\n");
- as = as.replace(new RegExp("{fn}", "g"), "firstname");
- as = as.replace(new RegExp("{ln}", "g"), "lastname");
- as = as.replace(new RegExp("{ti}", "g"), "title");
- as = as.replace(new RegExp("{sa}", "g"), "salutation");
+function _mapFormatPlaceholderTitles(pFormat, pAddrData, pCountry)
+{
+ //gstatic-paceholders
+ pFormat = pFormat.replace(new RegExp("%N", "g"), "{salutation_name}");
+ pFormat = pFormat.replace(new RegExp("%A", "g"), "{address_street buildingno}");
+ pFormat = pFormat.replace(new RegExp("%C", "g"), "{city}");
+ pFormat = pFormat.replace(new RegExp("%S", "g"), "{state}");
+ pFormat = pFormat.replace(new RegExp("%Z", "g"), "{zip}");
+ pFormat = pFormat.replace(new RegExp("%O", "g"), "{organisation_name}");
+ pFormat = pFormat.replace(new RegExp("%X", "g"), "");
+ pFormat = pFormat.replace(new RegExp("%n", "g"), "\n");
+
+ //shortform adito-placeholders
+ pFormat = pFormat.replace(new RegExp("{fn}", "g"), "{firstname}");
+ pFormat = pFormat.replace(new RegExp("{ln}", "g"), "{lpFormattname}");
+ pFormat = pFormat.replace(new RegExp("{ti}", "g"), "{title}");
+ pFormat = pFormat.replace(new RegExp("{sa}", "g"), "{salutation}");
+
+ if (pAddrData[8] == pAddrData[9])
+ pFormat = pFormat.replace(new RegExp("%D", "g"), "{district}");
+ else
+ pFormat = pFormat.replace(new RegExp("%D", "g"), "{district} \n {region}");
- if (pAddrData[8] == pAddrData[9]) as = as.replace(new RegExp("%D", "g"), "district");
- else as = as.replace(new RegExp("%D", "g"), "district \n region");
- if(pCountry == undefined || pCountry == null || pCountry == true) as = as + "\n country";
+ if(pCountry == undefined || pCountry == null || pCountry == true)
+ pFormat = pFormat + "\n {country}";
- return as;
+ return pFormat;
}
\ No newline at end of file
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 615cff9f2c8a321f8b9db481d5f4198be118afd0..0d8b84908b10e42213831fe846712a617822eee2 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -47,6 +47,7 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
SqlCondition.begin()
.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", attributeId, "# != ?")
.orPrepare("AB_ATTRIBUTEUSAGE.MAX_COUNT", pAttributeCount[attributeId], "# > ?")
+ .or("AB_ATTRIBUTEUSAGE.MAX_COUNT is null")
);
}
}
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index f533b09e7c845e0beb0501277af23ea1a42e228b..e70b9797751490b8bcce4814f808f76eee56abdc 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -15,14 +15,42 @@ import("Context_lib");
*/
function OrganisationUtils() {}
+/*
+ * retrieves the name of an organisation with a select statement
+ *
+ * @param {String} pOrganisationId the ID of the organisation that shall be searched in the database;
+ *
+ * @return {String} the name of the organisation
+ */
OrganisationUtils.getNameByOrganisationId = function(pOrganisationId)
{
var orgname = "";
if (pOrganisationId)
{
orgname = db.cell(SqlCondition.begin()
- .andPrepare("ORGANISATION.ORGANISATIONID", pOrganisationId)
- .buildSql("select ORGANISATION.NAME from ORGANISATION"));
+ .andPrepare("ORGANISATION.ORGANISATIONID", pOrganisationId)
+ .buildSql("select ORGANISATION.NAME from ORGANISATION"));
+ }
+ return orgname;
+};
+
+/*
+ * retrieves the name of an organisation with a select statement
+ *
+ * @param {String} pContactId the ID of the corresponding org-contact of the organisation that shall be searched in the database;
+ *
+ * @return {String} the name of the organisation
+ */
+OrganisationUtils.getNameByContactId = function(pContactId)
+{
+ var orgname = "";
+ if (pContactId)
+ {
+ orgname = db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACT", pContactId)
+ .buildSql("select ORGANISATION.NAME \n\
+ from ORGANISATION \n\
+ join CONTACT on (CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null)"));
}
return orgname;
};
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index e8e272a6ac67459211f4b33d858fd431b1d26ae1..39a53ff50e6a8ae0983da1ece4743bb30868f17e 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -27,21 +27,6 @@ ContextUtils.getCurrentContextId = function()
return vars.getString("$sys.currentcontextname");
}
-/**
- * Get the title of the current context
- * Note: The variable contexttitle is not always available.
- * In this case this function returns ""
- *
- * @return {String} Title of the current context
- */
-ContextUtils.getCurrentContextTitle = function()
-{
- if (vars.exists("$sys.currentcontexttitle") && vars.get("$sys.currentcontexttitle"))
- return vars.get("$sys.currentcontexttitle");
-
- return "";
-}
-
/**
* TODO: use System function. Currently the Name is also the id.
* Returns the Name of a context by the Id
@@ -144,21 +129,6 @@ ContextUtils.getContext = function(pContextId)
return ContextUtils._contextDataMapping(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, pContextId));
}
-/**
- * Prefix the given title with the current context title. (only if the title is available)
- * @param {String} pTitle
- *
- * @return {String} e.g.: Kontakt - Herr Tim Admin
- */
-ContextUtils.prefixWithCurrentContextTitle = function(pTitle)
-{
- var titlePrefix = ContextUtils.getCurrentContextTitle();
- if (titlePrefix)
- return titlePrefix + " - " + pTitle;
-
- return pTitle;
-}
-
/**
* map the contextData from the system.project-lib to [contextId, contextName, contextTitle]
*
diff --git a/process/Country_lib/Country_lib.aod b/process/Country_lib/Country_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7097e51847d7c7bb604c4435f916620d3a2ccf04
--- /dev/null
+++ b/process/Country_lib/Country_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+ <name>Country_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Country_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Country_lib/process.js b/process/Country_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..67f674c97d8e655ddf53b3ecdf639d6a2dbf4892
--- /dev/null
+++ b/process/Country_lib/process.js
@@ -0,0 +1,30 @@
+import("system.db");
+import("system.translate");
+import("Sql_lib");
+
+/**
+ * provides functions for miscellaneous interactions with countrydata
+ * Do not create an instance of this!
+ *
+ * @class
+ * @static
+ */
+function CountryUtils() {}
+
+/**
+* loads the translated latin name of an entry within the countryinfos by a provided ISO2-code
+*
+* @param {String} pIso2 the uppercase ISO2 code whoes latin name shall be retriefed, e.g."DE"
+* @param {String} [pLocale=current client/server language] specifies the locale for translating
+*
+* @return {String} the translated country name in the latin version
+*
+*/
+CountryUtils.getLatinNameByIso2 = function(pIso2, pLocale)
+{
+ var countryName = db.cell(SqlCondition.begin()
+ .andPrepare("AB_COUNTRYINFO.ISO2", pIso2)
+ .buildSql("select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO"));
+ countryName = pLocale ? translate.text(countryName, pLocale) : translate.text(countryName);
+ return countryName;
+};
\ No newline at end of file
diff --git a/process/Document_lib/process.js b/process/Document_lib/process.js
index 745d0bc6bfc7fa5637de655d18c8f90faa946e17..99ce4cc17d045c5c337a038e54a709c862ef2134 100644
--- a/process/Document_lib/process.js
+++ b/process/Document_lib/process.js
@@ -15,17 +15,27 @@ function DocumentUtil(){
/**
* Utility function to download all selected documents.
- * Selected documents will be checked with $local.uids.
+ * Selected documents will be checked with $sys.selectionRows
* Documents will be downloaded with neon.download
*/
DocumentUtil.downloadSelectedDocuments = function() {
var alias = db.getCurrentAlias();
- // Download selected files (=not opened)
- if(vars.exists("$local.uids") && vars.exists("$local.rows")
- && vars.get("$local.rows") && JSON.parse(vars.get("$local.rows")).length > 0) {
- var rows = JSON.parse(vars.get("$local.rows"));
- var uids = JSON.parse(vars.get("$local.uids"));
+ if(vars.exists("$sys.selectionRows") && vars.get("$sys.selectionRows")) {
+ var rows;
+ try {
+ rows = JSON.parse(vars.get("$sys.selectionRows"));
+ } catch (e) {
+ rows = JSON.parse(JSON.stringify(vars.get("$sys.selectionRows")));
+ }
+
+ var uids;
+ try {
+ uids = JSON.parse(vars.get("$sys.selection"));
+ } catch (e) {
+ uids = JSON.parse(JSON.stringify(vars.get("$sys.selection")));
+ }
+
var binaryContents = db.getBinaryContents(uids, alias);
// check if multiplie Files are selected.
@@ -39,29 +49,6 @@ DocumentUtil.downloadSelectedDocuments = function() {
}
}
-/**
- * Utility function dow download a single Document.
- */
-DocumentUtil.downloadSingleDocument = function() {
- var alias = db.getCurrentAlias();
- var id;
- var name;
-
- if(vars.exists("$local.uid")) {
- // Download single file (=not opened)
- id = JSON.parse(vars.get("$local.uid"));
- name = vars.get("$local.value");
- } else {
- // Download open file
- id = vars.get("$field.UID");
- name = vars.get("$field.NAME");
- }
-
- var binaryContent = db.getBinaryContent(id, alias);
- if(binaryContent != null && binaryContent != '')
- neon.download(binaryContent, name);
-}
-
/**
* Utility function to delete the current/opened Document.
*/
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index a74c939dcfbcd1555009d27ff9f07618d548323f..1b01908232f309424584197b5554fcb6aa8538c8 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -34,6 +34,7 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
* <br/>if the key could not be found an empty string "" is returned
* @param {String} keywordContainer specifies the type of the keyword and therefore the list elements; e.g. "COUNTRY"
* @param {String} key id value of the keyword where the view-value shall be searched
+ * @param {String} [locale] Language-value for translations
* @return {String} representation of the translated name of the keyword-key
* @example
* var histMedium;
@@ -42,7 +43,7 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
* result.string(vars.get("$field.SUBJECT") + " (" + LegacyKeywordUtils.getViewValue("ACTIVITY.MEDIUM", histMedium) + ")");
* }
*/
-KeywordUtils.getViewValue = function(keywordContainer, key)
+KeywordUtils.getViewValue = function(keywordContainer, key, locale)
{
if (!key)
return "";
@@ -54,7 +55,7 @@ KeywordUtils.getViewValue = function(keywordContainer, key)
var originalTitle = db.cell(sql);
if (originalTitle == "")
return "";
- var translatedTitle = translate.text(originalTitle);
+ var translatedTitle = locale ? translate.text(originalTitle, locale) : translate.text(originalTitle);
return translatedTitle;
};
@@ -294,11 +295,12 @@ LanguageKeywordUtils.getResolvedTitleSqlPart = function(pDbFieldName, pLocale)
* returns a specific name (translated) - this is normally the view-value of a language
*
* @param {String} key id value of the language where the view-value shall be searched
+ * @param {String} [locale] Language-value for translations
*
* @return {String} representation of the translated name
*
*/
-LanguageKeywordUtils.getViewValue = function(key)
+LanguageKeywordUtils.getViewValue = function(key, locale)
{
if (!key)
return "";
@@ -309,7 +311,7 @@ LanguageKeywordUtils.getViewValue = function(key)
var originalTitle = db.cell(sql);
if (originalTitle == "")
return "";
- var translatedTitle = translate.text(originalTitle);
+ var translatedTitle = locale ? translate.text(originalTitle, locale) : translate.text(originalTitle);
return translatedTitle;
};
diff --git a/process/Loghistory_lib/Loghistory_lib.aod b/process/Loghistory_lib/Loghistory_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..454f37cd2f2f3108e77c6eb547d95229067e1eca
--- /dev/null
+++ b/process/Loghistory_lib/Loghistory_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+ <name>Loghistory_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Loghistory_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Loghistory_lib/process.js b/process/Loghistory_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..474b568aeb46e6601ee1010579b373c94b605b70
--- /dev/null
+++ b/process/Loghistory_lib/process.js
@@ -0,0 +1,419 @@
+import("system.vars");
+import("system.util");
+import("system.logging");
+import("system.project");
+import("system.calendars");
+import("system.db");
+import("system.process");
+import("system.text");
+import("system.datetime");
+import("system.translate");
+import("system.SQLTYPES");
+import("Keyword_lib");
+import("Attribute_lib");
+import("Sql_lib");
+import("Attribute_lib");
+import("Contact_lib");
+import("AddressEntity_lib");
+import("Util_lib");
+import("KeywordRegistry_basic");
+
+/**
+ * object for writing the LogHistory based on audit-changes
+ * this object will be probably only usefull within the "process_audit"-process
+ *
+ * @param {String} pTable name of logged-table
+ * @param {String} pUser name of the user that performed that change
+ * @param {String[]} pColumns columns that have been changed
+ * @param {String[]} pNewValues if available the new values that correspond to pColumns
+ * @param {String[]} pOldValues if available the existing values that correspond to pColumns
+ * @param {String} pTimeStamp timestamp when the change has been audited
+ * @param {String} pAction the SQL-action of what was done (insert/update/delete)
+ * @param {String} pIdValue primaryKey value of the reocrd that has been audited
+ *
+ * @class
+ */
+function LogHistoryExecutor(pTable, pUser, pColumns, pNewValues, pOldValues, pTimeStamp, pAction, pIdValue)
+{
+ this.structureDefinitionAlias = "Data_alias";//alias where the definition of what shall be logged is stored
+ this.oldValues = pOldValues || [];
+ this.newValues = pNewValues || [];
+ this.affectedTable = pTable.toUpperCase();
+ this.triggeringUser = pUser;
+ this.timestamp = pTimeStamp;
+ this.sqlAction = pAction;
+ this.idValue = pIdValue;
+ this.columns = pColumns.map(function (v){
+ return v.toUpperCase();
+ });
+ this.translationLanguage = LogHistoryExecutor.TRANSLATION_LANGUAGE();
+}
+
+/*
+* returns a constant value in which language the logging shall be done;
+* if you change that value this will affect only new entries not existing ones
+*
+* @return {String} locale value that can be passed to translate.* methods
+*/
+LogHistoryExecutor.TRANSLATION_LANGUAGE = function()
+{
+ return "DE_de";
+};
+
+/*
+* executes the logging action into the AB_LOGHIST table
+* this is the main function to use
+*
+* @return null
+*/
+LogHistoryExecutor.prototype.execute = function ()
+{
+ var references = {};
+ var columnStructure = {};
+ var primaryKey = "";
+ var somethingTolog = false;
+
+ var structure = project.getAliasDefinitionStructure(this.structureDefinitionAlias, this.affectedTable);
+ if (structure)
+ {
+ columnStructure = structure.tables[this.affectedTable].columns;
+ for (var column in columnStructure)
+ {
+ if (columnStructure[column].tableRef)
+ references[column] = {
+ table: columnStructure[column].tableRef,
+ id: ""
+ };
+ if (columnStructure[column].primaryKey)
+ primaryKey = column;
+ if (columnStructure[column].log)
+ somethingTolog = true;
+ }
+ }
+
+ if (!somethingTolog)
+ return null;
+
+ if (this.affectedTable == "AB_LOGHISTORY")//this would cause an endless logging-loop otherwise
+ throw new Error(translate.withArguments("the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored", ["AB_LOGHISTORY"]));
+
+ var idvalue = this.idValue;
+ var description = [];
+ var extra = [];
+ extra["COMMUNICATION"] = {
+ IDs: ["CONTACT_ID", "MEDIUM_ID"],
+ RefTable: "CONTACT",
+ Description: translate.text("Communication", this.translationLanguage)
+ };
+ extra["AB_ATTRIBUTERELATION"] = {
+ IDs: ["OBJECT_ROWID", "AB_ATTRIBUTE_ID"],
+ Description: translate.text("Attribute", this.translationLanguage)
+ };
+
+ if (extra[this.affectedTable])
+ {
+ var conf = extra[this.affectedTable];
+ var oldvalues = {};
+ var newvalues = {};
+
+ for(i = 0; i < this.columns.length; i++ )
+ {
+ if (this.sqlAction == 'D' || this.sqlAction == 'U') oldvalues[this.columns[i]] = this.oldValues[i];
+ if (this.sqlAction == 'I' || this.sqlAction == 'U') newvalues[this.columns[i]] = this.newValues[i];
+ }
+ if (this.sqlAction == 'D') newvalues = oldvalues;
+ if ((this.sqlAction == 'D' || this.sqlAction == 'I') && newvalues[conf.IDs[1]])
+ {
+ idvalue = newvalues[conf.IDs[0]];
+ var data = this._getDataForExtras(newvalues[conf.IDs[1]], newvalues);
+ description.push(translate.withArguments("%0 \"%1\"", [conf.Description + " " + data[0] + ":", data[1]], this.translationLanguage));
+ }
+ if (this.sqlAction == 'U')
+ {
+ var ids = db.array(db.ROW, "select " + conf.IDs.join(", ") + " from " + this.affectedTable + " where " + this.affectedTable + "ID = '" + idvalue + "'");
+ idvalue = ids[0];
+ var oldid = ids[1];
+ if (oldvalues[conf.IDs[1]]) oldid = oldvalues[conf.IDs[1]];
+ var olddata = this._getDataForExtras(oldid, oldvalues);
+ var newdata = this._getDataForExtras(ids[1], newvalues);
+ if (newdata[1] && olddata[1])
+ {
+ if (olddata[0] == newdata[0])
+ description.push(translate.withArguments("%0 from \"%1\" to \"%2\"", [conf.Description + " " + olddata[0], olddata[1], newdata[1]], this.translationLanguage));
+ else
+ description.push(translate.withArguments("%0 from \"%1\" to %2 \"%3\"", [conf.Description + " " + olddata[0], olddata[1], conf.Description + " " + newdata[0] , newdata[1]], this.translationLanguage));
+ }
+ else if(this.affectedTable == "COMMUNICATION" && olddata[0] != newdata[0])//fyi: no change of the "Standard"-flag will be logged
+ {
+ description.push(translate.withArguments("%0 from \"%1\" to \"%2\"", [conf.Description, olddata[0], newdata[0]], this.translationLanguage));
+ }
+ }
+ if (conf.RefTable) this.affectedTable = conf.RefTable;
+ } //no extra tables
+ else
+ {
+ if (this.affectedTable == "ASYS_CALENDARBACKEND")
+ {
+ var entrytypePosition = this.columns.indexOf("ENTRYTYPE");
+ if (entrytypePosition > -1 && this.newValues[entrytypePosition] == calendars.VEVENT)
+ return null;
+ }
+
+ for (var i = 0; i < this.columns.length; i++)
+ {
+ if (this.affectedTable == "ASYS_CALENDARBACKEND" && this.columns[i] == "VCOMPONENT")
+ this._getCalendarDescription(i);
+
+ if (references[this.columns[i]])
+ {
+ if (this.sqlAction == "I") references[this.columns[i]].id = this.newValues[i];
+ if (this.sqlAction == "D") references[this.columns[i]].id = this.oldValues[i];
+ }
+
+ var logfield = columnStructure[this.columns[i]];
+ if (logfield && logfield.log)
+ {
+ if (this.sqlAction != 'I' && this.oldValues[i] != "")
+ this.oldValues[i] = this._getFormattedValue(this.columns[i], logfield, this.oldValues[i]);
+ if (this.sqlAction != 'D' && this.newValues[i] != "")
+ this.newValues[i] = this._getFormattedValue(this.columns[i], logfield, this.newValues[i]);
+
+ var logfieldTitle = (logfield.title ? translate.text(logfield.title, this.translationLanguage) : translate.text("Value", this.translationLanguage));
+ if (this.sqlAction == 'U' && this.oldValues[i] != this.newValues[i])
+ {
+ if (this.oldValues[i] == "[CLOB]" || this.oldValues[i] == "")
+ description.push(translate.withArguments("%0 \"%1\"", [logfieldTitle + ":", this.newValues[i]], this.translationLanguage));
+ else
+ description.push(translate.withArguments("%0 from \"%1\" to \"%2\"", [logfieldTitle + ":", this.oldValues[i], this.newValues[i]], this.translationLanguage));
+
+ }
+ if (this.sqlAction == 'I' && this.newValues[i] != "") description.push(logfieldTitle + ": \"" + this.newValues[i] + "\"");
+ if (this.sqlAction == 'D' && this.oldValues[i] != "") description.push(logfieldTitle + ": \"" + this.oldValues[i] + "\"");
+ }
+ }
+ if (this.sqlAction == "U")
+ {
+ for (var index in references) references[index].id = db.cell("select " + index + " from " + this.affectedTable + " where " + primaryKey + " = '" + this.idValue + "'");
+ }
+ }
+
+ if (description.length > 0)
+ {
+ if (this.sqlAction == 'I') description = translate.withArguments("%0 added.", [description.join(", ")], this.translationLanguage);
+ else if (this.sqlAction == 'U') description = translate.withArguments("%0 modified.", [description.join(", ")], this.translationLanguage);
+ else if (this.sqlAction == 'D') description = translate.withArguments("%0 deleted.", [description.join(", ")], this.translationLanguage);
+ for (index in references)
+ {
+ if (references[index].id != "")
+ {
+ this._addEntryForInsert(references[index].table.trim(), references[index].id, this.affectedTable.trim(), idvalue, description);
+ idvalue = "";
+ }
+ }
+ if (idvalue != "")
+ {
+ this._addEntryForInsert(this.affectedTable.trim(), idvalue, "", "", description);
+ }
+ }
+ this._insertLoghistEntry();
+ return null;
+};
+
+/*
+* adds an entry that shall be inserted into the AB_LOGHIST-table
+* that information is collected and later inserted within one transaction via the "_insertLoghistEntry"-function
+*
+* @param {String} pTablename name of the table that is logged
+* @param {String} pTablenameId UID-value of the entry that is logged
+* @param {String} pSourceTablename reserved for future | specifies if the origin of a change was somewhere else (which table)
+* @param {String} pSourceTablenameId reserved for future | specifies if the origin of a change was somewhere else (which id in that ref-table)
+* @param {String} pDescription text that describes the changes that have been done
+*
+* @return void
+*/
+LogHistoryExecutor.prototype._addEntryForInsert = function (pTablename, pTablenameId, pSourceTablename, pSourceTablenameId, pDescription)
+{
+ if (this.toInsert == undefined)
+ {
+ //the "SOURCE_TABLENAME" and "SOURCE_TABLENAMEID" are reserved for later usage in the change-notification-subscriptions //TODO: check if they are really needed
+ this.toInsert = {
+ statements: []
+ ,cols: ["LOGTYPE","TABLENAME","TABLENAMEID","DESCRIPTION", "SOURCE_TABLENAME", "SOURCE_TABLENAMEID", "DATE_NEW","USER_NEW"]
+ };
+ this.toInsert.types = db.getColumnTypes("AB_LOGHISTORY", this.toInsert.cols);//load only once for better performance
+ }
+
+ var vals = [this.sqlAction, pTablename, pTablenameId, pDescription, pSourceTablename, pSourceTablenameId, this.timestamp, this.triggeringUser];
+ this.toInsert.statements.push(["AB_LOGHISTORY", this.toInsert.cols, this.toInsert.types, vals]);
+};
+
+/*
+* inserts the pending entries into the AB_LOGHIST-table within one transaction
+* elements have to be added before this via the "_addEntryForInsert"-function oterwise nothing will happen
+*
+* @return void
+*/
+LogHistoryExecutor.prototype._insertLoghistEntry = function ()
+{
+ if (this.toInsert && this.toInsert.statements)
+ db.inserts(this.toInsert.statements);
+};
+
+
+/*
+* collects data for the tables with "extra"-cases
+*
+* @param {String} pId the table id
+* @param {Object} pValues key-value maps of values
+*
+* @return {Array} has either zero (tabledefinition not found) or 2 elements: first ist somehow a title while the second element is a resolved value
+*/
+LogHistoryExecutor.prototype._getDataForExtras = function(pId, pValues)
+{
+ var data = [];
+
+ if (this.affectedTable == "AB_ATTRIBUTERELATION")
+ {
+ data[0] = AttributeUtil.getFullAttributeName(pId);
+ data[1] = AttributeRelationUtils.selectAttributeValue(pId, pValues, true);
+ }
+ else if (this.affectedTable == "COMMUNICATION")
+ {
+ data[0] = KeywordUtils.getViewValue($KeywordRegistry.communicationMedium(), pId);
+ data[1] = pValues["ADDR"];
+ }
+ return data;
+};
+
+
+/*
+* Creates the description for changes in the calendar
+*
+* @param {String} pIndex calendarfield index (position) within the values
+*
+* @return {String} the description of the action
+*/
+LogHistoryExecutor.prototype._getCalendarDescription = function (pIndex)
+{
+ if (this.sqlAction != "D") this.newValues[pIndex] = _getEntry("DESCRIPTION:", this.newValues[pIndex]);
+ if (this.sqlAction != "I") this.oldValues[pIndex] = _getEntry("DESCRIPTION:", this.oldValues[pIndex]);
+
+ function _getEntry(pWert, pVcomponent)
+ {
+ var value = pVcomponent.toString().match(new RegExp(pWert + ".+\r"));
+ if (value != null) return value.toString().replace(pWert, "").replace(/\\R\\N/g, "\r\n");
+ else return "";
+ }
+};
+
+/*
+* determines if a value has to be formatted and if so, performs that formatting strategy
+* this depends mostly on the configuration; if a:
+* - keyword is set, the view value of the keyword is retrieved
+* - translate4Log process is set, that process will be executed
+* - autoMapTrueFalse4Log is set, the raw value will be tried to translate to a "yes" or "no" text based on common cases
+* - the field is a TIMESTAMP field the raw long-value will be formatted
+*
+* @param {Object} pDescription the structureConfig of one specific field which is logged
+* @param {String} pColumnName name of the column whoes value shall be formatted
+* @param {String} pValue raw value that shall be formatted
+*
+* @return {String} if necessary the formattedValue otherwise the original value
+*/
+LogHistoryExecutor.prototype._getFormattedValue = function (pColumnName, pDescription, pValue)
+{
+ if (pDescription.keyword != null && pDescription.keyword != "")
+ {
+ if (/^(; \d*)*$/.test(pValue))
+ {
+ pValue = text.decodeMS(pValue);
+ for (let i = 0; i < pValue.length; i++)
+ {
+ if (!isNaN(pValue[i])) pValue[i] = getKeyName(pValue[i], pDescription.keyword);//TODO: keyword
+ }
+ pValue = pValue.join(", ");
+ }
+ else pValue = KeywordUtils.getViewValue(pDescription.keyword, pValue, this.translationLanguage);
+ }
+ else if (pDescription.translate4Log != null && pDescription.translate4Log != "")
+ {
+ var params = Translate4LogParams.generateParams(this.idValue, pValue.toString(), this.sqlAction, this.translationLanguage);
+ var scriptId = "LogHistoryExecutor._getFormattedValue."
+ + this.structureDefinitionAlias + "." + this.affectedTable + "." + pColumnName + ".translate4Log";
+ pValue = process.executeScript(scriptId, pDescription.translate4Log, params, vars.get("$sys.dbalias"));
+ }
+ else if (pDescription.columnType == String(SQLTYPES.TIMESTAMP))
+ pValue = datetime.toDate(pValue, translate.text("dd.MM.yyyy", this.translationLanguage), "Europe/Berlin");//TODO: timezone?
+ else if (pDescription.autoMapTrueFalse4Log)
+ {
+ switch (pValue.toLowerCase())
+ {
+ case "true":
+ case "t":
+ case "y":
+ case "1":
+ pValue = translate.text("Yes", this.translationLanguage);
+ break;
+ case "false":
+ case "f":
+ case "n":
+ case "0":
+ case "2":
+ pValue = translate.text("No", this.translationLanguage);
+ break;
+ default:
+ break;
+ }
+ }
+ return pValue;
+}
+
+
+/**
+ * object for easier handling of the parameters that are provided within the translate4Log-process for auditing
+ *
+ * @example
+ * import("system.result");
+ * import("Loghistory_lib");
+ * import("Keyword_lib");
+ *
+ * var params = Translate4LogParams.load();
+ * var res = LanguageKeywordUtils.getViewValue(params.value, params.locale);
+ * result.string(res);
+ * @class
+ */
+function Translate4LogParams()
+{
+ //watch out the Translate4LogParams.generateParams function
+ this.rowId = vars.get("$local.rowId");
+ this.value = vars.get("$local.value");
+ this.action = vars.get("$local.action");
+ this.locale = vars.get("$local.locale");
+}
+
+
+/**
+ * function for generating the parameters which can be passed to another process
+ * the parameters should be self explaing since every single of them is a parametervalue that will be passed to anotherProcess
+ *
+ * @static
+ */
+Translate4LogParams.generateParams = function (pRowId, pValue, pAction, pLocale)
+{
+ //watch out the Translate4LogParams-constructor function
+ var res = {
+ rowId: pRowId,
+ value: pValue,
+ action: pAction,
+ locale: pLocale
+ };
+ return res;//store in variable for autocomplete of the ADITO designer
+};
+
+/**
+ * creates an instnace of Translate4LogParams and loads the data
+ */
+Translate4LogParams.load = function()
+{
+ return new Translate4LogParams();
+};
\ No newline at end of file
diff --git a/process/indexsearch_patternextension/indexsearch_patternextension.aod b/process/indexsearch_patternextension/indexsearch_patternextension.aod
index 44786e98684ee3028b4ef80a8809e874a45f7ba2..b7e2519c6746699347c0e1c7d199e304db788d48 100644
--- a/process/indexsearch_patternextension/indexsearch_patternextension.aod
+++ b/process/indexsearch_patternextension/indexsearch_patternextension.aod
@@ -2,4 +2,5 @@
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>indexsearch_patternextension</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/indexsearch_patternextension/process.js</process>
</process>
diff --git a/process/indexsearch_patternextension/process.js b/process/indexsearch_patternextension/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/process/process_audit/process.js b/process/process_audit/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..4b1e7955421b6ef81afdfbb2969dc098370f4bf2
--- /dev/null
+++ b/process/process_audit/process.js
@@ -0,0 +1,18 @@
+import("system.logging");
+import("Loghistory_lib");
+import("system.vars");
+import("system.process");
+
+var tableName = vars.get("$local.table");
+var id = vars.get("$local.idvalue");
+var columns = vars.get("$local.columns");
+var timestamp = vars.get("$local.timestamp");
+var newvalues = vars.get("$local.values");
+var oldvalues = vars.get("$local.oldvalues");
+var sqlAction = vars.get("$local.action");
+var userLogin = vars.get("$local.user");
+
+if (sqlAction != 'X')
+{
+ (new LogHistoryExecutor(tableName, userLogin, columns, newvalues, oldvalues, timestamp, sqlAction, id)).execute();
+}
diff --git a/process/process_audit/process_audit.aod b/process/process_audit/process_audit.aod
new file mode 100644
index 0000000000000000000000000000000000000000..55b53099a0f6b045a1699cb473417840521a8b09
--- /dev/null
+++ b/process/process_audit/process_audit.aod
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+ <name>process_audit</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/process_audit/process.js</process>
+ <alias>Data_alias</alias>
+</process>