diff --git a/.aditoprj/ignoredScanServiceTasks.json b/.aditoprj/ignoredScanServiceTasks.json index 7a82a0675d76038ae9b1c576dcc22b21ae577991..d621cb1f862cc1fd76cc2c1bca508bf89cbf5c34 100644 --- a/.aditoprj/ignoredScanServiceTasks.json +++ b/.aditoprj/ignoredScanServiceTasks.json @@ -78,144 +78,6 @@ "description": "There is no index for the column \"DEPLOYMENT_ID\" in the table \"DATABASECHANGELOG\" [59]", "groupName": "nb-tasklist-warning" }, - { - "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod", - "line": -1, - "description": "Dead Reference \"NOTIFICATION_PRIO\" located in: ObserverationEditGeneric/fields/entityField/NOTIFICATION_PRIO [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod", - "line": -1, - "description": "Dead Reference \"OBJECT_FIELD\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_FIELD [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod", - "line": -1, - "description": "Dead Reference \"OBJECT_FILTER\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_FILTER [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod", - "line": -1, - "description": "Dead Reference \"OBJECT_ID\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_ID [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod", - "line": -1, - "description": "Dead Reference \"OBJECT_TYPE\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_TYPE [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod", - "line": -1, - "description": "Dead Reference \"OBSERVER\" located in: ObserverationEditGeneric/fields/entityField/OBSERVER [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod", - "line": -1, - "description": "Dead Reference \"TRIGGEREVENTDELETE\" located in: ObserverationEditGeneric/fields/entityField/TRIGGEREVENTDELETE [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod", - "line": -1, - "description": "Dead Reference \"TRIGGEREVENTINSERT\" located in: ObserverationEditGeneric/fields/entityField/TRIGGEREVENTINSERT [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod", - "line": -1, - "description": "Dead Reference \"TRIGGEREVENTUPDATE\" located in: ObserverationEditGeneric/fields/entityField/TRIGGEREVENTUPDATE [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod", - "line": -1, - "description": "Dead Reference \"FilterActions\" located in: ObservationFilterTreeTable/favoriteActionGroup1/FilterActions [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod", - "line": -1, - "description": "Dead Reference \"NOTIFICATION_PRIO\" located in: ObservationFilterTreeTable/columns/entityField/NOTIFICATION_PRIO [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod", - "line": -1, - "description": "Dead Reference \"OBJECT_TYPE\" located in: ObservationFilterTreeTable/columns/entityField/OBJECT_TYPE [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod", - "line": -1, - "description": "Dead Reference \"OBSERVATION_ID\" located in: ObservationFilterTreeTable/parentField/OBSERVATION_ID [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod", - "line": -1, - "description": "Dead Reference \"OnlyMyObservations_param\" located in: neonDashletConfiguration/parameters/OnlyMyObservations_param [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod", - "line": -1, - "description": "Dead Reference \"observationType\" located in: ObservationFilterTreeTable/columns/entityField/observationType [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod", - "line": -1, - "description": "Dead Reference \"NOTIFICATION_PRIO\" located in: ObservationPreviewCard/subtitleField/NOTIFICATION_PRIO [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod", - "line": -1, - "description": "Dead Reference \"OBJECT_FIELD\" located in: ObservationPreviewGeneric/fields/entityField/OBJECT_FIELD [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod", - "line": -1, - "description": "Dead Reference \"OBJECT_FILTER\" located in: ObservationPreviewGeneric/fields/entityField/OBJECT_FILTER [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod", - "line": -1, - "description": "Dead Reference \"OBJECT_ID\" located in: ObservationPreviewGeneric/fields/entityField/OBJECT_ID [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod", - "line": -1, - "description": "Dead Reference \"OBJECT_TYPE\" located in: ObservationPreviewCard/titleField/OBJECT_TYPE [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod", - "line": -1, - "description": "Dead Reference \"TRIGGEREVENTDELETE\" located in: ObservationPreviewScoreCard/fields/entityField/TRIGGEREVENTDELETE [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod", - "line": -1, - "description": "Dead Reference \"TRIGGEREVENTINSERT\" located in: ObservationPreviewScoreCard/fields/entityField/TRIGGEREVENTINSERT [67]", - "groupName": "nb-tasklist-warning" - }, - { - "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod", - "line": -1, - "description": "Dead Reference \"TRIGGEREVENTUPDATE\" located in: ObservationPreviewScoreCard/fields/entityField/TRIGGEREVENTUPDATE [67]", - "groupName": "nb-tasklist-warning" - }, { "target": "neonView/SalesprojectAnalysesPhases_view/SalesprojectAnalysesPhases_view.aod", "line": -1, diff --git a/.liquibase/Data_alias/basic/2021.2.2/Mosaico/append_mosaicoTemplateCategory.xml b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/append_mosaicoTemplateCategory.xml new file mode 100644 index 0000000000000000000000000000000000000000..62ada358254d029efe897ff7d8b52e309839fbe3 --- /dev/null +++ b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/append_mosaicoTemplateCategory.xml @@ -0,0 +1,17 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> + <changeSet author="a.fraeder" id="b564a74d-cba8-406d-8a54-f56663f02c09"> + <insert tableName="AB_KEYWORD_ENTRY"> + <column name="AB_KEYWORD_ENTRYID" value="a5e6edd3-35cb-4da0-b1c2-463e5ad5cae9"/> + <column name="AB_KEYWORD_CATEGORY_ID" value="be28e8a4-08d4-4697-b248-8b97b4e6e749"/> + <column name="KEYID" value="LANDINGPAGE"/> + <column name="TITLE" value="Landingpage"/> + <column name="CONTAINER" value="MosaicoTemplateCategory"/> + <column name="SORTING" valueNumeric="5"/> + <column name="ISACTIVE" valueNumeric="1"/> + <column name="ISESSENTIAL" valueNumeric="0"/> + </insert> + </changeSet> +</databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/2021.2.2/Mosaico/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/changelog.xml new file mode 100644 index 0000000000000000000000000000000000000000..1bdc1fd3b6bea6ee93fb3d8a8ebe9a86f8de7e74 --- /dev/null +++ b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/changelog.xml @@ -0,0 +1,7 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> + <include relativeToChangelogFile="true" file="insert_mosaico_color_keyword.xml"/> + <include relativeToChangelogFile="true" file="append_mosaicoTemplateCategory.xml"/> +</databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml index c403e8c28cfcd962e78fec41c209a9574f4ee02e..99965c48e688f6233a99f168ddacbdffe26874bf 100644 --- a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml +++ b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml @@ -15,7 +15,7 @@ <include relativeToChangelogFile="true" file="Salesorderitem/changelog.xml"/> <include relativeToChangelogFile="true" file="Salesproject/changelog.xml"/> <include relativeToChangelogFile="true" file="Employee/changelog.xml"/> - <include relativeToChangelogFile="true" file="Mosaico/insert_mosaico_color_keyword.xml"/> + <include relativeToChangelogFile="true" file="Mosaico/changelog.xml"/> <include relativeToChangelogFile="true" file="Mailbridge/changelog.xml"/> <include relativeToChangelogFile="true" file="OfferOrder/changelog.xml"/> <include relativeToChangelogFile="true" file="BulkMail/changelog.xml"/> diff --git a/.liquibase/Data_alias/basic/changelog.xml b/.liquibase/Data_alias/basic/changelog.xml deleted file mode 100644 index 44a36199efe5f881e9bbbf97ae0a7466823c196a..0000000000000000000000000000000000000000 --- a/.liquibase/Data_alias/basic/changelog.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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"> - <include relativeToChangelogFile="true" file="basic/init/init.xml"/> - <include relativeToChangelogFile="true" file="basic/2019.1.4/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2019.2.1/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2019.3.0/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2019.3.1/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2019.3.2/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2019.3.3/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.0.0/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.0.1/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.0.2/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.0.3/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.2.1/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.2.2/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2020.2.3/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.0.0/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.0.1/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.0.2/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.0.3/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.1.0/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.1.1/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.1.2/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.1.3/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.2.0/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.2.2/changelog.xml"/> - - <include relativeToChangelogFile="true" file="basic/workflows/changelog.xml" context="workflow"/> - <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/> -</databaseChangeLog> \ No newline at end of file diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 0da85faf6dd0f753f0d8a6174c472ec3e09d6d8e..e0fe2ce5865b77fc70df40d6a685472d792643d2 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -50,7 +50,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -150,8 +150,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -164,8 +164,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -205,7 +205,7 @@ <name>PICTURE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -445,8 +445,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -473,8 +473,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -720,8 +720,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -748,8 +748,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -775,7 +775,7 @@ <name>PICTURE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1092,8 +1092,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1120,8 +1120,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -1175,7 +1175,7 @@ <name>VALIDATION_RESULT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1242,8 +1242,8 @@ <name>ISSTANDARD</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -1283,8 +1283,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1297,8 +1297,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -1406,8 +1406,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1466,8 +1466,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1566,8 +1566,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1585,7 +1585,7 @@ <name>REMARK</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1645,8 +1645,8 @@ <name>ADVERTISING</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -1706,7 +1706,7 @@ <columnType v="12" /> <size v="100" /> <scale v="0" /> - <notNull v="true" /> + <notNull v="false" /> <isUnique v="true" /> <index v="true" /> <title>Product number</title> @@ -1822,8 +1822,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1850,8 +1850,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -1877,7 +1877,7 @@ <name>PICTURE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1925,8 +1925,8 @@ <name>OPTIONAL</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -1945,8 +1945,8 @@ <name>TAKEPRICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -1992,7 +1992,7 @@ <name>QUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2092,7 +2092,7 @@ <name>PRICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2112,7 +2112,7 @@ <name>VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2205,8 +2205,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2224,7 +2224,7 @@ <name>FROMQUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2277,8 +2277,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2382,7 +2382,7 @@ <name>QUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2403,8 +2403,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2449,8 +2449,8 @@ <name>IN_OUT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -2627,7 +2627,7 @@ <name>FLAG</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -2688,7 +2688,7 @@ <name>VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2714,8 +2714,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2766,10 +2766,10 @@ <name>PROBABILITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> - <scale v="0" /> - <notNull v="false" /> + <columnType v="3" /> + <size v="14" /> + <scale v="2" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <title>Probability</title> @@ -2848,7 +2848,7 @@ <name>NET</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2873,7 +2873,7 @@ <name>HEADER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -2935,7 +2935,7 @@ <name>ADDRESS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -3008,7 +3008,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -3030,8 +3030,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3058,8 +3058,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -3113,7 +3113,7 @@ <name>FOOTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -3155,35 +3155,7 @@ <name>DISCOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> - <size v="14" /> - <scale v="2" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DISCOUNTED_NET</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2" /> - <size v="14" /> - <scale v="2" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DISCOUNTED_VAT</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3270,7 +3242,7 @@ <name>PRICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3290,7 +3262,7 @@ <name>QUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3310,7 +3282,7 @@ <name>VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3402,10 +3374,10 @@ <name>DISCOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <title>Discount %</title> @@ -3442,8 +3414,8 @@ <name>OPTIONAL</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -3517,7 +3489,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <title>Assigned to</title> <description></description> <customProperties> @@ -3552,7 +3524,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -3569,6 +3541,20 @@ </customBooleanProperty> </customProperties> </entityFieldDb> + <entityFieldDb> + <name>SHOWPRICE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="-7" /> + <size v="3" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -3594,8 +3580,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3613,7 +3599,7 @@ <name>VOLUME</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3633,7 +3619,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -3654,8 +3640,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3786,7 +3772,7 @@ <columnType v="3" /> <size v="6" /> <scale v="2" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -3862,8 +3848,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3876,8 +3862,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4000,7 +3986,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4057,8 +4043,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -4138,8 +4124,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -4158,7 +4144,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4267,8 +4253,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4295,8 +4281,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -4322,8 +4308,8 @@ <name>RESPONSIBLE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="12" /> - <size v="50" /> + <columnType v="1" /> + <size v="36" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -4393,7 +4379,7 @@ <name>VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -4414,7 +4400,7 @@ <name>FOOTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4435,7 +4421,7 @@ <name>HEADER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4478,8 +4464,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4552,7 +4538,7 @@ <name>NET</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -4667,7 +4653,7 @@ <name>NOTICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4689,8 +4675,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4709,8 +4695,8 @@ <name>CANCELLATION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -4736,8 +4722,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4756,7 +4742,7 @@ <name>DUNNINGTEXT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4804,8 +4790,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4902,7 +4888,7 @@ <name>PAYMENTADDRESS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4970,7 +4956,7 @@ <name>DELIVERYADDRESS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4991,8 +4977,8 @@ <name>ORDERSTATUS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -5027,39 +5013,11 @@ <title></title> <description></description> </entityFieldDb> - <entityFieldDb> - <name>DISCOUNTED_VAT</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2" /> - <size v="14" /> - <scale v="2" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> <entityFieldDb> <name>DISCOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> - <size v="14" /> - <scale v="2" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DISCOUNTED_NET</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -5118,7 +5076,7 @@ <name>PRICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -5139,7 +5097,7 @@ <name>QUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -5160,7 +5118,7 @@ <name>VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -5213,10 +5171,10 @@ <name>DISCOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -5340,7 +5298,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title>Assigned to</title> <description></description> @@ -5391,7 +5349,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -5459,8 +5417,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -5552,7 +5510,7 @@ <name>DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -5654,8 +5612,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -5769,8 +5727,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -5797,8 +5755,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -5941,7 +5899,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -6156,8 +6114,8 @@ <name>ATTRIBUTE_ACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -6240,7 +6198,7 @@ <name>ATTRIBUTE_INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -6331,8 +6289,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -6351,7 +6309,7 @@ <name>NUMBER_VALUE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -6471,8 +6429,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -6499,8 +6457,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -6651,8 +6609,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -6665,8 +6623,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -6725,8 +6683,8 @@ <name>ISESSENTIAL</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -6830,8 +6788,8 @@ <name>ISACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -6955,8 +6913,8 @@ <name>ISACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -7146,8 +7104,8 @@ <name>BOOL_VALUE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -7181,7 +7139,7 @@ <name>NUMBER_VALUE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -7244,7 +7202,7 @@ <name>LONG_CHAR_VALUE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -7826,8 +7784,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -8118,8 +8076,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8138,7 +8096,7 @@ <name>LOCKED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="16" /> + <columnType v="-7" /> <size v="1" /> <scale v="0" /> <notNull v="true" /> @@ -8227,7 +8185,7 @@ <name>DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -8312,8 +8270,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="true" /> @@ -8360,8 +8318,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8409,8 +8367,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8541,8 +8499,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8576,8 +8534,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -8673,8 +8631,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8729,8 +8687,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -8826,8 +8784,8 @@ <name>ALL_TICKET_CATEGORIES</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -8860,8 +8818,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8888,8 +8846,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -8978,8 +8936,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9034,8 +8992,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -9165,8 +9123,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9207,8 +9165,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9287,8 +9245,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9427,8 +9385,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -9594,8 +9552,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9629,8 +9587,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -9768,8 +9726,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9810,8 +9768,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -9837,7 +9795,7 @@ <name>NET</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -9949,7 +9907,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> - <size v="36" /> + <size v="63" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -9962,7 +9920,7 @@ <name>FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -10139,7 +10097,7 @@ <columnType v="1" /> <size v="36" /> <scale v="0" /> - <notNull v="true" /> + <notNull v="false" /> <isUnique v="false" /> <index v="true" /> <documentation></documentation> @@ -10150,7 +10108,7 @@ <name>SCOREPOINTS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -10240,9 +10198,9 @@ <name>SCOREPERCENT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="4" /> <size v="10" /> - <scale v="2" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -10420,8 +10378,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -10433,7 +10391,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -10588,7 +10546,7 @@ <columnType v="1" /> <size v="36" /> <scale v="0" /> - <notNull v="true" /> + <notNull v="false" /> <isUnique v="false" /> <index v="true" /> <documentation></documentation> @@ -10662,7 +10620,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -10690,7 +10648,7 @@ <name>REASON</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -10705,8 +10663,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -10767,8 +10725,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -10973,8 +10931,8 @@ <name>CREATEACTIVITIES</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -11015,8 +10973,8 @@ <name>USE_TEMPLATE_ATTACHMENTS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -11030,8 +10988,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11086,8 +11044,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11114,8 +11072,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11165,6 +11123,20 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>CAMPAIGN_ID</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -11260,8 +11232,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11301,8 +11273,8 @@ <name>IS_TEST_RECIPIENT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -11316,8 +11288,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11330,8 +11302,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11455,8 +11427,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11510,7 +11482,7 @@ <name>EMAIL_DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -11525,8 +11497,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11651,8 +11623,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11755,8 +11727,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11769,8 +11741,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11818,8 +11790,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -11969,7 +11941,7 @@ <name>DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -12031,7 +12003,7 @@ <name>MAIL</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -12046,8 +12018,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -12088,8 +12060,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -12129,7 +12101,7 @@ <name>RECIPIENTS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -12158,8 +12130,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -12233,8 +12205,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -12275,8 +12247,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -12655,7 +12627,7 @@ <columnType v="1" /> <size v="36" /> <scale v="0" /> - <notNull v="true" /> + <notNull v="false" /> <isUnique v="false" /> <index v="true" /> <documentation></documentation> @@ -12708,8 +12680,8 @@ <name>ONSITE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -12722,8 +12694,8 @@ <name>RESPONSIBLE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -12785,8 +12757,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -12798,7 +12770,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -12854,8 +12826,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -12882,8 +12854,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -12979,7 +12951,7 @@ <name>SCAN_PATTERN</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -13118,8 +13090,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13174,8 +13146,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13439,8 +13411,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13767,8 +13739,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13893,8 +13865,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13921,8 +13893,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13997,8 +13969,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14039,8 +14011,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14392,7 +14364,7 @@ <name>OBJECT_FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -14407,8 +14379,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14421,8 +14393,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14580,8 +14552,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14636,8 +14608,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14803,8 +14775,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14817,8 +14789,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14990,8 +14962,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15018,8 +14990,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -15122,8 +15094,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15191,7 +15163,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -15262,8 +15234,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15290,8 +15262,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15365,7 +15337,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -15428,7 +15400,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="92" /> - <size v="8" /> + <size v="10" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -15442,7 +15414,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="92" /> - <size v="8" /> + <size v="10" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -15567,7 +15539,7 @@ <name>PREPARATION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -15830,8 +15802,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15858,8 +15830,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -15990,8 +15962,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16032,8 +16004,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16115,7 +16087,7 @@ <name>DISTRICT_FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -16178,8 +16150,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16234,8 +16206,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16304,8 +16276,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16318,8 +16290,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16500,8 +16472,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16514,8 +16486,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16528,8 +16500,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16556,8 +16528,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16658,7 +16630,7 @@ <name>DISCUSSIONTEXT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -16673,8 +16645,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16729,8 +16701,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16805,8 +16777,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16833,8 +16805,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16923,8 +16895,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16999,7 +16971,7 @@ <name>CONTENTDECODED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -17034,7 +17006,7 @@ <name>CONTENT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -17056,8 +17028,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17201,8 +17173,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17243,8 +17215,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17409,8 +17381,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17423,8 +17395,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17499,8 +17471,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17541,8 +17513,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17706,8 +17678,8 @@ <name>IS_ARCHIVED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -17795,7 +17767,7 @@ <name>OBJECT_FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -17809,8 +17781,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17899,8 +17871,8 @@ <name>TRIGGEREVENTDELETE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -17912,8 +17884,8 @@ <name>TRIGGEREVENTINSERT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -17925,8 +17897,8 @@ <name>TRIGGEREVENTUPDATE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -17939,8 +17911,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17977,7 +17949,7 @@ <name>OBJECT_FIELD</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -18036,8 +18008,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18062,8 +18034,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18173,8 +18145,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18199,8 +18171,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18237,8 +18209,8 @@ <name>AUTO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -18251,7 +18223,7 @@ <name>COND</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -18265,8 +18237,8 @@ <name>FILTER_USED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -18326,8 +18298,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18339,8 +18311,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18419,7 +18391,7 @@ <name>COND</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -18493,8 +18465,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18519,8 +18491,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18584,8 +18556,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18708,8 +18680,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18739,7 +18711,7 @@ <size v="36" /> <scale v="0" /> <notNull v="false" /> - <isUnique v="false" /> + <isUnique v="true" /> <index v="true" /> <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/ab_synccontact/entityfields/asys_favoriteid/documentation.adoc</documentation> <title></title> @@ -18778,8 +18750,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18806,8 +18778,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18842,7 +18814,7 @@ <description></description> <auditSyncConfig> <name>auditSyncConfig</name> - <auditMode v="0" /> + <auditMode v="1" /> <syncActive v="false" /> <syncComplete v="true" /> <syncDirection v="1" /> @@ -18860,16 +18832,23 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>${WEBLINK_SCORE}</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>DATE_EDIT</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18890,14 +18869,20 @@ <documentation></documentation> <title></title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>DATE_NEW</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18944,8 +18929,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>URL</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>USER_EDIT</name> @@ -18972,8 +18964,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Placeholder</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>WORKFLOWPROCESSDEFINITION_KEY</name> @@ -18986,22 +18985,36 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Workflow</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>ISREDIRECT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Redirect</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>WORKFLOWSIGNAL_NAME</name> @@ -19014,8 +19027,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Signal</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>ACTION_TYPE</name> @@ -19070,8 +19090,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19098,8 +19118,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19187,7 +19207,7 @@ <name>ERRORMESSAGE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -19300,8 +19320,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19404,8 +19424,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19432,8 +19452,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19632,8 +19652,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19646,8 +19666,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -19687,8 +19707,8 @@ <name>ISACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -19736,8 +19756,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19778,8 +19798,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="true" /> @@ -19910,8 +19930,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19924,8 +19944,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20042,8 +20062,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20056,8 +20076,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20173,8 +20193,8 @@ <name>IS_DEFAULT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -20188,8 +20208,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20202,8 +20222,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20362,8 +20382,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20376,8 +20396,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20390,8 +20410,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20465,7 +20485,7 @@ <name>MONTH_FACTOR</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="5" /> <scale v="2" /> <notNull v="false" /> @@ -20513,7 +20533,7 @@ <name>FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -20528,8 +20548,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20556,8 +20576,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20679,8 +20699,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20781,8 +20801,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -21102,7 +21122,7 @@ <name>PERSINFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -21467,8 +21487,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -21508,7 +21528,7 @@ <name>ORGINFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -21551,8 +21571,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -21627,7 +21647,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="2004" /> - <size v="2147483647" /> + <size v="65535" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -21641,7 +21661,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="2004" /> - <size v="2147483647" /> + <size v="65535" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -21745,8 +21765,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -21806,7 +21826,7 @@ <name>FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -21904,8 +21924,8 @@ <name>ISACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -21933,8 +21953,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -21947,8 +21967,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -22036,7 +22056,7 @@ <name>PRICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -22058,8 +22078,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -22071,7 +22091,7 @@ <name>QUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -22092,7 +22112,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -22179,7 +22199,7 @@ <name>TARGETAMOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2" /> + <columnType v="3" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -22261,8 +22281,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -22288,8 +22308,8 @@ <name>SENT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -22401,8 +22421,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -22455,8 +22475,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -22513,7 +22533,7 @@ <columnType v="1" /> <size v="36" /> <scale v="0" /> - <notNull v="true" /> + <notNull v="false" /> <isUnique v="false" /> <index v="true" /> <documentation></documentation> @@ -22545,8 +22565,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -22677,8 +22697,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -22705,8 +22725,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -22808,8 +22828,8 @@ <name>ACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -22823,8 +22843,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -22977,8 +22997,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -23053,8 +23073,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -23066,7 +23086,7 @@ <name>DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -23095,8 +23115,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -24052,8 +24072,8 @@ <name>ACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -24178,7 +24198,7 @@ <name>DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -24234,8 +24254,8 @@ <name>REVIEW</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -24409,8 +24429,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -24652,8 +24672,8 @@ <name>DEFAULTSIGNATURE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -24964,7 +24984,7 @@ <name>COND</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -25111,8 +25131,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -25139,8 +25159,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -25201,8 +25221,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -25228,7 +25248,7 @@ <name>CONTENT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -25243,8 +25263,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -25270,7 +25290,7 @@ <name>METADATA</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -25390,8 +25410,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -25432,8 +25452,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -25485,6 +25505,111 @@ </entityFieldDb> </entityFields> </entityDb> + <entityDb> + <name>ASYS_VERSIONHISTORY</name> + <category></category> + <dbName></dbName> + <idColumn></idColumn> + <idGeneratorType v="1" /> + <idGeneratorInterval v="1" /> + <documentation></documentation> + <title></title> + <description></description> + <auditSyncConfig> + <name>auditSyncConfig</name> + <auditMode v="0" /> + <syncActive v="false" /> + <syncComplete v="true" /> + <syncDirection v="1" /> + <syncIds></syncIds> + </auditSyncConfig> + <entityFields> + <entityFieldDb> + <name>TABLE_NAME</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>VERSION</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="23" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>OPERATION_DESCRIPTION</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>OPERATION_TYPE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + </entityFields> + </entityDb> </entities> </entityGroup> </aliasDefDb> diff --git a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod index 330076bb4dcfbdedefc2c99bbf41680b9218dde8..c0c4b00661a6a2b38fe821cd45215b5ff7d1e164 100644 --- a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod +++ b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod @@ -2917,20 +2917,6 @@ <title></title> <description></description> </entityFieldDb> - <entityFieldDb> - <name>DISCOUNTED_VAT</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="3" /> - <size v="14" /> - <scale v="2" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> <entityFieldDb> <name>VERSNR</name> <dbName></dbName> @@ -3212,27 +3198,13 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>DISCOUNTED_NET</name> + <name>PROBABILITY</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="3" /> <size v="14" /> <scale v="2" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>PROBABILITY</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> - <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -3462,7 +3434,7 @@ <columnType v="3" /> <size v="14" /> <scale v="2" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -3553,6 +3525,20 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>SHOWPRICE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="-7" /> + <size v="3" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -4777,20 +4763,6 @@ <title></title> <description></description> </entityFieldDb> - <entityFieldDb> - <name>TEMPLATECONTENT</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="-1" /> - <size v="2147483647" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -5640,7 +5612,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -5668,7 +5640,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -5682,7 +5654,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -5738,7 +5710,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -5757,6 +5729,62 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -6532,7 +6560,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -11774,7 +11802,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -11844,7 +11872,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -11900,7 +11928,21 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>CAMPAIGN_ID</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -12938,7 +12980,7 @@ <columnType v="3" /> <size v="6" /> <scale v="2" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -15203,20 +15245,6 @@ <title></title> <description></description> </entityFieldDb> - <entityFieldDb> - <name>DISCOUNTED_VAT</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="3" /> - <size v="14" /> - <scale v="2" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> <entityFieldDb> <name>PAYDUEDATE</name> <dbName></dbName> @@ -15567,20 +15595,6 @@ <title></title> <description></description> </entityFieldDb> - <entityFieldDb> - <name>DISCOUNTED_NET</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="3" /> - <size v="14" /> - <scale v="2" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> <entityFieldDb> <name>DELIVERYADDRESS</name> <dbName></dbName> @@ -15810,7 +15824,7 @@ <columnType v="3" /> <size v="14" /> <scale v="2" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -17262,7 +17276,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -17512,7 +17526,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -17540,7 +17554,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -17742,7 +17756,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -18096,7 +18110,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -18674,7 +18688,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -19356,7 +19370,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -19634,7 +19648,7 @@ <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -19676,7 +19690,7 @@ <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -19850,7 +19864,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -19912,7 +19926,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -20330,20 +20344,6 @@ <syncIds></syncIds> </auditSyncConfig> <entityFields> - <entityFieldDb> - <name>DATE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="19" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> <entityFieldDb> <name>INBOXFILTERGROUPID</name> <dbName></dbName> @@ -20400,33 +20400,12 @@ <title></title> <description></description> </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>INBOX_EMPLOYEEGROUP_RELATION</name> - <category></category> - <dbName></dbName> - <idColumn>INBOX_EMPLOYEEGROUP_RELATIONID</idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="1" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> <entityFieldDb> - <name>EMPLOYEEGROUP_ID</name> + <name>DATE_EDIT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="1" /> - <size v="36" /> + <columnType v="93" /> + <size v="19" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -20436,25 +20415,39 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>INBOX_EMPLOYEEGROUP_RELATIONID</name> + <name>DATE_NEW</name> <dbName></dbName> - <primaryKey v="true" /> - <columnType v="1" /> - <size v="36" /> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> <scale v="0" /> - <notNull v="true" /> - <isUnique v="true" /> - <index v="true" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> <documentation></documentation> <title></title> <description></description> </entityFieldDb> <entityFieldDb> - <name>INBOX_ID</name> + <name>USER_NEW</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="1" /> - <size v="36" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -20466,10 +20459,10 @@ </entityFields> </entityDb> <entityDb> - <name>EMPLOYEEGROUP_RULEGROUP</name> + <name>INBOX_EMPLOYEEGROUP_RELATION</name> <category></category> <dbName></dbName> - <idColumn>EMPLOYEEGROUP_RULEGROUPID</idColumn> + <idColumn>INBOX_EMPLOYEEGROUP_RELATIONID</idColumn> <idGeneratorType v="0" /> <idGeneratorInterval v="1" /> <documentation></documentation> @@ -20485,7 +20478,49 @@ </auditSyncConfig> <entityFields> <entityFieldDb> - <name>DATE</name> + <name>EMPLOYEEGROUP_ID</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>INBOX_EMPLOYEEGROUP_RELATIONID</name> + <dbName></dbName> + <primaryKey v="true" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="true" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>INBOX_ID</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> @@ -20498,6 +20533,69 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + </entityFields> + </entityDb> + <entityDb> + <name>EMPLOYEEGROUP_RULEGROUP</name> + <category></category> + <dbName></dbName> + <idColumn>EMPLOYEEGROUP_RULEGROUPID</idColumn> + <idGeneratorType v="0" /> + <idGeneratorInterval v="1" /> + <documentation></documentation> + <title></title> + <description></description> + <auditSyncConfig> + <name>auditSyncConfig</name> + <auditMode v="0" /> + <syncActive v="false" /> + <syncComplete v="true" /> + <syncDirection v="1" /> + <syncIds></syncIds> + </auditSyncConfig> + <entityFields> <entityFieldDb> <name>EMPLOYEEGROUP_RULEGROUPID</name> <dbName></dbName> @@ -20540,6 +20638,62 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -20570,7 +20724,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -20584,7 +20738,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -20631,6 +20785,62 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -20653,7 +20863,49 @@ </auditSyncConfig> <entityFields> <entityFieldDb> - <name>DATE</name> + <name>STATUS</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></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>EMPLOYEEGROUPID</name> + <dbName></dbName> + <primaryKey v="true" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="true" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>GROUPNAME</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> @@ -20667,7 +20919,70 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>STATUS</name> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + </entityFields> + </entityDb> + <entityDb> + <name>INBOXFILTERGROUP_RELATION</name> + <category></category> + <dbName></dbName> + <idColumn>INBOXFILTERGROUP_RELATIONID</idColumn> + <idGeneratorType v="0" /> + <idGeneratorInterval v="1" /> + <documentation></documentation> + <title></title> + <description></description> + <auditSyncConfig> + <name>auditSyncConfig</name> + <auditMode v="0" /> + <syncActive v="false" /> + <syncComplete v="true" /> + <syncDirection v="1" /> + <syncIds></syncIds> + </auditSyncConfig> + <entityFields> + <entityFieldDb> + <name>INBOXFILTERGROUP_ID</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="1" /> @@ -20675,13 +20990,13 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> </entityFieldDb> <entityFieldDb> - <name>EMPLOYEEGROUPID</name> + <name>INBOXFILTERGROUP_RELATIONID</name> <dbName></dbName> <primaryKey v="true" /> <columnType v="1" /> @@ -20695,7 +21010,63 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>GROUPNAME</name> + <name>INBOX_ID</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> @@ -20711,10 +21082,10 @@ </entityFields> </entityDb> <entityDb> - <name>INBOXFILTERGROUP_RELATION</name> + <name>EMPLOYEEGROUP_CONTACT_RELATION</name> <category></category> <dbName></dbName> - <idColumn>INBOXFILTERGROUP_RELATIONID</idColumn> + <idColumn>EMPLOYEEGROUP_CONTACT_RELATIONID</idColumn> <idGeneratorType v="0" /> <idGeneratorInterval v="1" /> <documentation></documentation> @@ -20730,7 +21101,7 @@ </auditSyncConfig> <entityFields> <entityFieldDb> - <name>INBOXFILTERGROUP_ID</name> + <name>EMPLOYEEGROUP_ID</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="1" /> @@ -20738,13 +21109,13 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> </entityFieldDb> <entityFieldDb> - <name>INBOXFILTERGROUP_RELATIONID</name> + <name>EMPLOYEEGROUP_CONTACT_RELATIONID</name> <dbName></dbName> <primaryKey v="true" /> <columnType v="1" /> @@ -20758,7 +21129,7 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>INBOX_ID</name> + <name>CONTACT_ID</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="1" /> @@ -20766,38 +21137,31 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> <index v="false" /> <documentation></documentation> <title></title> <description></description> </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>EMPLOYEEGROUP_CONTACT_RELATION</name> - <category></category> - <dbName></dbName> - <idColumn>EMPLOYEEGROUP_CONTACT_RELATIONID</idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="1" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> <entityFieldDb> - <name>EMPLOYEEGROUP_ID</name> + <name>DATE_NEW</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="1" /> - <size v="36" /> + <columnType v="93" /> + <size v="19" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -20807,25 +21171,25 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>EMPLOYEEGROUP_CONTACT_RELATIONID</name> + <name>USER_NEW</name> <dbName></dbName> - <primaryKey v="true" /> - <columnType v="1" /> - <size v="36" /> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> <scale v="0" /> - <notNull v="true" /> - <isUnique v="true" /> - <index v="true" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> <documentation></documentation> <title></title> <description></description> </entityFieldDb> <entityFieldDb> - <name>CONTACT_ID</name> + <name>USER_EDIT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="1" /> - <size v="36" /> + <columnType v="12" /> + <size v="50" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -20920,7 +21284,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -20962,7 +21326,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -21093,6 +21457,62 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -21212,6 +21632,62 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -21256,7 +21732,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -21298,7 +21774,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -21307,8 +21783,64 @@ <name>INBOX_ID</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="1" /> - <size v="36" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DEFAULTSIGNATURE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="-7" /> + <size v="3" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>MAILSIGNATUREID</name> + <dbName></dbName> + <primaryKey v="true" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="true" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DEFAULT_TICKETTEMPLATE_ID</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>WORKFLOW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -21318,11 +21850,11 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>DEFAULTSIGNATURE</name> + <name>DATE_EDIT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-7" /> - <size v="3" /> + <columnType v="93" /> + <size v="19" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -21332,25 +21864,25 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>MAILSIGNATUREID</name> + <name>USER_EDIT</name> <dbName></dbName> - <primaryKey v="true" /> - <columnType v="1" /> - <size v="36" /> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> <scale v="0" /> - <notNull v="true" /> - <isUnique v="true" /> - <index v="true" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> <documentation></documentation> <title></title> <description></description> </entityFieldDb> <entityFieldDb> - <name>DEFAULT_TICKETTEMPLATE_ID</name> + <name>DATE_NEW</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="1" /> - <size v="36" /> + <columnType v="93" /> + <size v="19" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -21360,11 +21892,11 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>WORKFLOW</name> + <name>USER_NEW</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> - <size v="255" /> + <size v="50" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -21634,7 +22166,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -21711,7 +22243,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -21725,7 +22257,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -21744,6 +22276,62 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -21774,7 +22362,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -21821,6 +22409,62 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="19" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -21851,7 +22495,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -21942,6 +22586,111 @@ </entityFieldDb> </entityFields> </entityDb> + <entityDb> + <name>ASYS_VERSIONHISTORY</name> + <category></category> + <dbName></dbName> + <idColumn></idColumn> + <idGeneratorType v="1" /> + <idGeneratorInterval v="1" /> + <documentation></documentation> + <title></title> + <description></description> + <auditSyncConfig> + <name>auditSyncConfig</name> + <auditMode v="0" /> + <syncActive v="false" /> + <syncComplete v="true" /> + <syncDirection v="1" /> + <syncIds></syncIds> + </auditSyncConfig> + <entityFields> + <entityFieldDb> + <name>TABLE_NAME</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>VERSION</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="23" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>OPERATION_DESCRIPTION</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>OPERATION_TYPE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + </entityFields> + </entityDb> </entities> </entityGroup> </aliasDefDb> diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod index de6505640c09bff45e08372fe5b76ed266128395..85afd87bb6d1be5e353fbc97fc4b4a248a7be9f8 100644 --- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod +++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod @@ -19,8 +19,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="26" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -32,8 +32,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -57,7 +57,7 @@ <name>ICON</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -148,7 +148,7 @@ <name>XMLDATA</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -230,7 +230,7 @@ <name>BINDATA</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -270,8 +270,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -283,8 +283,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -296,7 +296,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> - <size v="127" /> + <size v="2048" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -373,7 +373,7 @@ <name>PREVIEW</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -473,8 +473,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -486,8 +486,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -503,7 +503,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <title></title> <description></description> </entityFieldDb> @@ -512,8 +512,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -564,8 +564,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -616,8 +616,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -667,7 +667,7 @@ <name>VCOMPONENT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -706,7 +706,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <title></title> <description></description> </entityFieldDb> @@ -745,7 +745,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <title></title> <description></description> </entityFieldDb> @@ -814,8 +814,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -827,8 +827,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -883,7 +883,7 @@ <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <title></title> <description></description> </entityFieldDb> @@ -896,7 +896,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <title></title> <description></description> </entityFieldDb> @@ -904,7 +904,7 @@ <name>PROPVAL_CLOB</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -939,8 +939,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -952,8 +952,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -977,7 +977,7 @@ <name>ICON</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1094,7 +1094,7 @@ <name>XMLDATA</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1220,7 +1220,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <title></title> <description></description> </entityFieldDb> @@ -1254,7 +1254,7 @@ <name>PARAMETERS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1327,7 +1327,7 @@ <name>CATEGORIES</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1418,7 +1418,7 @@ <name>PARAMETERS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1431,7 +1431,7 @@ <name>PREVIEW</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1572,8 +1572,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1586,8 +1586,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1641,7 +1641,7 @@ <name>RECIPIENTUSERIDS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1669,7 +1669,7 @@ <name>BACKPACK</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1748,9 +1748,9 @@ <columnType v="12" /> <size v="255" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <documentation></documentation> <title></title> <description></description> @@ -1764,7 +1764,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <documentation></documentation> <title></title> <description></description> @@ -1790,9 +1790,9 @@ <columnType v="12" /> <size v="255" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <documentation></documentation> <title></title> <description></description> @@ -1866,7 +1866,7 @@ <columnType v="1" /> <size v="36" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="true" /> <documentation></documentation> @@ -1911,8 +1911,8 @@ <name>CONDTYPE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -1925,7 +1925,7 @@ <name>COND</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1956,7 +1956,7 @@ <columnType v="1" /> <size v="36" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="true" /> <documentation></documentation> @@ -2063,8 +2063,8 @@ <name>ASSIGNABLE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="5" /> - <size v="5" /> + <columnType v="-7" /> + <size v="3" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -2091,7 +2091,7 @@ <name>CHILDREN</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -2153,7 +2153,7 @@ <name>VISUALISATIONCONFIG</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -2284,7 +2284,7 @@ <name>METRICS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> + <columnType v="-1" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -2313,8 +2313,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -2361,8 +2361,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2423,8 +2423,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -2687,8 +2687,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2700,7 +2700,7 @@ <name>LOCKED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="16" /> + <columnType v="-7" /> <size v="1" /> <scale v="0" /> <notNull v="true" /> @@ -2791,8 +2791,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2833,8 +2833,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2926,6 +2926,20 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>TIMEZONE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="64" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -2939,8 +2953,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2952,8 +2966,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2969,7 +2983,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <title></title> <description></description> </entityFieldDb> @@ -2995,7 +3009,7 @@ <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <title></title> <description></description> </entityFieldDb> @@ -3008,7 +3022,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <title></title> <description></description> </entityFieldDb> @@ -3056,8 +3070,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3082,8 +3096,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="19" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3266,7 +3280,7 @@ <name>BINDATA</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2004" /> + <columnType v="-4" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -3281,8 +3295,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="23" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3295,8 +3309,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <size v="23" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3377,7 +3391,7 @@ </entityFields> </entityDb> <entityDb> - <name>ASYS_MAILREPOSIT</name> + <name>ASYS_CALENDARSYNC</name> <dbName></dbName> <idColumn></idColumn> <idGeneratorType v="0" /> @@ -3395,11 +3409,11 @@ </auditSyncConfig> <entityFields> <entityFieldDb> - <name>FLAGGED</name> + <name>LASTMODIFIED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> + <columnType v="93" /> + <size v="23" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -3409,13 +3423,13 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>FOLDER</name> + <name>MASTERUID</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> - <size v="255" /> + <size v="512" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -3423,25 +3437,59 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>ID</name> + <name>SLAVEUID</name> <dbName></dbName> <primaryKey v="true" /> - <columnType v="1" /> - <size v="36" /> + <columnType v="12" /> + <size v="127" /> <scale v="0" /> <notNull v="true" /> - <isUnique v="true" /> - <index v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>SUSER</name> + <dbName></dbName> + <primaryKey v="true" /> + <columnType v="12" /> + <size v="63" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> <documentation></documentation> <title></title> <description></description> </entityFieldDb> + </entityFields> + </entityDb> + <entityDb> + <name>ASYS_AUDIT</name> + <dbName></dbName> + <idColumn></idColumn> + <idGeneratorType v="0" /> + <idGeneratorInterval v="0" /> + <documentation></documentation> + <title></title> + <description></description> + <auditSyncConfig> + <name>auditSyncConfig</name> + <auditMode v="0" /> + <syncActive v="false" /> + <syncComplete v="true" /> + <syncDirection v="1" /> + <syncIds></syncIds> + </auditSyncConfig> + <entityFields> <entityFieldDb> - <name>MAIL</name> + <name>ACOLUMNNAME</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> - <size v="2147483647" /> + <columnType v="12" /> + <size v="127" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -3451,7 +3499,7 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>MAILUSER</name> + <name>ALIAS</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> @@ -3459,18 +3507,18 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <documentation></documentation> <title></title> <description></description> </entityFieldDb> <entityFieldDb> - <name>RECEIVEDATE</name> + <name>ATABLENAME</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <columnType v="12" /> + <size v="127" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3479,25 +3527,25 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>RECENT</name> + <name>ATIMESTAMP</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> + <columnType v="93" /> + <size v="23" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <documentation></documentation> <title></title> <description></description> </entityFieldDb> <entityFieldDb> - <name>RECIPIENT</name> + <name>AUSER</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> - <size v="2046" /> + <size v="255" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -3507,11 +3555,11 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>SEEN</name> + <name>DATASETID</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> + <columnType v="12" /> + <size v="1023" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -3521,11 +3569,11 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>SENDER</name> + <name>DATASETNEWVALUE_BLOB</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="12" /> - <size v="127" /> + <columnType v="-4" /> + <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -3535,12 +3583,12 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>SENTDATE</name> + <name>DATASETNEWVALUE_CLOB</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <columnType v="-1" /> + <size v="2147483647" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3549,7 +3597,7 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>SUBJECT</name> + <name>DATASETNEWVALUE_STRING</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> @@ -3562,32 +3610,26 @@ <title></title> <description></description> </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>ASYS_MAILREPOSIT_HASH</name> - <dbName></dbName> - <idColumn></idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="0" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> <entityFieldDb> - <name>MAILHASH</name> + <name>LOGTIME</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="12" /> - <size v="31" /> + <columnType v="93" /> + <size v="23" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>LOGTYPE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="4" /> + <size v="10" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -3597,15 +3639,29 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>MAILINFO</name> + <name>LOGWRITERUID</name> <dbName></dbName> - <primaryKey v="true" /> + <primaryKey v="false" /> <columnType v="12" /> <size v="127" /> <scale v="0" /> - <notNull v="true" /> - <isUnique v="true" /> - <index v="true" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>SQLACTION</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></title> <description></description> @@ -3613,7 +3669,7 @@ </entityFields> </entityDb> <entityDb> - <name>ASYS_CALENDARSYNC</name> + <name>ASYS_SYNCSLAVES</name> <dbName></dbName> <idColumn></idColumn> <idGeneratorType v="0" /> @@ -3631,12 +3687,12 @@ </auditSyncConfig> <entityFields> <entityFieldDb> - <name>LASTMODIFIED</name> + <name>ACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> + <columnType v="4" /> + <size v="10" /> + <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3645,97 +3701,7 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>MASTERUID</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="512" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>SLAVEUID</name> - <dbName></dbName> - <primaryKey v="true" /> - <columnType v="12" /> - <size v="127" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>SUSER</name> - <dbName></dbName> - <primaryKey v="true" /> - <columnType v="12" /> - <size v="63" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>ASYS_UIDRESOLVER</name> - <dbName></dbName> - <idColumn></idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="0" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> - <entityFieldDb> - <name>ENTRY_TYPE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="255" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>ENTRY_UID</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="512" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>ENTRY_USER</name> + <name>DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> @@ -3748,32 +3714,12 @@ <title></title> <description></description> </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>ASYS_FARM</name> - <dbName></dbName> - <idColumn></idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="0" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> <entityFieldDb> - <name>ADDRESS</name> + <name>DEVICEID</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> - <size v="255" /> + <size v="40" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -3783,7 +3729,7 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>CLIENTS</name> + <name>INTERVALL</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="4" /> @@ -3797,39 +3743,11 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>FARMVERSION</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="12" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>LICENSE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="255" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>SENCODING</name> + <name>LASTSYNC</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> + <columnType v="93" /> + <size v="23" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -3839,7 +3757,7 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>SERVERID</name> + <name>SLAVEUID</name> <dbName></dbName> <primaryKey v="true" /> <columnType v="12" /> @@ -3852,24 +3770,10 @@ <title></title> <description></description> </entityFieldDb> - <entityFieldDb> - <name>WORKLOAD</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> </entityFields> </entityDb> <entityDb> - <name>ASYS_FARM_CLIENT</name> + <name>ASYS_VERSIONHISTORY</name> <dbName></dbName> <idColumn></idColumn> <idGeneratorType v="0" /> @@ -3887,55 +3791,27 @@ </auditSyncConfig> <entityFields> <entityFieldDb> - <name>CHARACTERISTIC</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>CLIENTID</name> + <name>DATE_NEW</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="12" /> - <size v="255" /> - <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" /> + <columnType v="93" /> + <size v="23" /> <scale v="0" /> <notNull v="true" /> - <isUnique v="true" /> + <isUnique v="false" /> <index v="true" /> <documentation></documentation> <title></title> <description></description> </entityFieldDb> <entityFieldDb> - <name>SADDRESS</name> + <name>OPERATION_DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> <size v="255" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -3943,13 +3819,13 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>SERVERID</name> + <name>OPERATION_TYPE</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> <size v="255" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -3957,47 +3833,13 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>USERNAME</name> + <name>TABLE_NAME</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> <size v="255" /> <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>ASYS_AUDIT</name> - <dbName></dbName> - <idColumn></idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="0" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> - <entityFieldDb> - <name>ACOLUMNNAME</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="127" /> - <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -4005,13 +3847,13 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>ALIAS</name> + <name>USER_NEW</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> - <size v="255" /> + <size v="36" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="false" /> <documentation></documentation> @@ -4019,820 +3861,14 @@ <description></description> </entityFieldDb> <entityFieldDb> - <name>ATABLENAME</name> + <name>VERSION</name> <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> - <size v="127" /> + <size v="36" /> <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>ATIMESTAMP</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>AUSER</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="255" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DATASETID</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="1023" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DATASETNEWVALUE_BLOB</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2004" /> - <size v="2147483647" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DATASETNEWVALUE_CLOB</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2005" /> - <size v="2147483647" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DATASETNEWVALUE_STRING</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="1023" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>LOGTIME</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>LOGTYPE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>LOGWRITERUID</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>SQLACTION</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></title> - <description></description> - </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>ASYS_SYNCSLAVES</name> - <dbName></dbName> - <idColumn></idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="0" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> - <entityFieldDb> - <name>ACTIVE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DESCRIPTION</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="255" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DEVICEID</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="40" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>INTERVALL</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>LASTSYNC</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>SLAVEUID</name> - <dbName></dbName> - <primaryKey v="true" /> - <columnType v="12" /> - <size v="127" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="true" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>ASYS_XMPP_OFFLINESTANZA</name> - <dbName></dbName> - <idColumn></idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="0" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> - <entityFieldDb> - <name>ATIMESTAMP</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>JID</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="64" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>STANZA</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2005" /> - <size v="2147483647" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>ASYS_XMPP_HISTORY</name> - <dbName></dbName> - <idColumn></idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="0" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> - <entityFieldDb> - <name>ATIMESTAMP</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>CHATMARKER</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="16" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>JID_FROM</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="64" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>JID_TO</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="64" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>MSGMARKER</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="255" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>MSGTYPE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="16" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>STANZA</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2005" /> - <size v="2147483647" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>ASYS_VERSIONHISTORY</name> - <dbName></dbName> - <idColumn></idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="0" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> - <entityFieldDb> - <name>DATE_NEW</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>OPERATION_DESCRIPTION</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="255" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>OPERATION_TYPE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="255" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>TABLE_NAME</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="255" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>USER_NEW</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="36" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>VERSION</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="36" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>ASYS_TEST</name> - <dbName></dbName> - <idColumn>ID</idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="1" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> - <entityFieldDb> - <name>DATE_EDIT</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DATE_NEW</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> - <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="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>USER_NEW</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="63" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>USER_EDIT</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="63" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>TEST_VARCHAR_1</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="50" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - </entityFields> - </entityDb> - <entityDb> - <name>ASYS_USER</name> - <dbName></dbName> - <idColumn>ID</idColumn> - <idGeneratorType v="0" /> - <idGeneratorInterval v="1" /> - <documentation></documentation> - <title></title> - <description></description> - <auditSyncConfig> - <name>auditSyncConfig</name> - <auditMode v="0" /> - <syncActive v="false" /> - <syncComplete v="true" /> - <syncDirection v="1" /> - <syncIds></syncIds> - </auditSyncConfig> - <entityFields> - <entityFieldDb> - <name>DATE_EDIT</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DESCRIPTION</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="255" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>KIND</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="4" /> - <size v="10" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>XMLDATA</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2004" /> - <size v="2147483647" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>TITLE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="63" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="true" /> - <index v="true" /> - <documentation></documentation> - <title></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="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>ICON</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2004" /> - <size v="2147483647" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <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="true" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>USER_NEW</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="63" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>USER_EDIT</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="63" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>NAME</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="63" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="true" /> <index v="true" /> <documentation></documentation> <title></title> diff --git a/entity/360Degree_entity/documentation.adoc b/entity/360Degree_entity/documentation.adoc index b07c00500ceb7ed1fc24f01140cf046eb2f41251..ff20617c53b29d44b7664603bc648e649ddb5aed 100644 --- a/entity/360Degree_entity/documentation.adoc +++ b/entity/360Degree_entity/documentation.adoc @@ -1,36 +1,329 @@ +:hardbreaks: +:toc2: left +:toclevels: 5 +:sectnums: +:sectnumlevels: 5 +:toc-title: Index +:figure-caption: Figure +:icons: font +:numbered: +:source-autofit: +:table-stripes: odd = 360Degree_entity -The 360Degree_entity shows the Connection between data models. -The entity has two providers for persons and organizations. +//// +(required only for separate PDF generation) +//// -The 360Degree_entity shows direct connections, don´t be confused with the ObjectRelation_entity. +//include::_default_attributes_EN.adoc[] -== Adding new modules to the 360° view -You may want to display more modules within the 360degree view (for example after creating and implemeting your own module). +<<< -.An Example: -You added a module called "T-Shirts" to your project. Every person-contact can have _n_ "T-Shirts" and whenever a person owns a T-Shirt you want to -display it in the 360degree view. +== Introduction -Heres is a list of what you need to do whenever you want to do this: +The 360Degree_entity models the relations between specific Entities and enables the user to work with these dependencies via the 360DegreeFilter_view, which includes the ViewTemplates "Tree" and "Timeline". -- At first you have to fill/add certain Fields/Processes in your new Context. - - Add (These have to be written exactly like that, if not already existing): - - DATE_NEW, this Field has to contain a Date as a Long Value. That will be used as the Date Value you can see in the Timeline View-Template. - - ACTIVE, in this Field you can specify which Datasets are active or not. You have to declare that in the Value Expression as a Case-When due to the Filter - - Fill (these can be filled in the specific Entity as a Process) - - #CONTENTTITLE, this will be the main display Text and the blue Link - - #CONTENTDESCRIPTION, this will be the smaller, mostly longer, Text beneath the #CONTENTTITLE - -- Add an element (with the name of the context you want to add) in the process of the `ObjectType_param` in the *corresponding provider* which is located in the `360Degree_entity`. _We would extend the JSON-Object which is returned in the `PersonObjects`-provider by the name of our t-shirt-context: "TShirt" in our example +Currently, the 360Degree logic is restricted to relations of Contact_entity (i.e., of companies and persons). This means that -- In that JSON-Object you can/have to add some Configuration Elements to change the results. - - connectionField, here you have to declare a Field that writes exactly like the one in your Entity (Standard is CONTACT_ID!!!). The Value of this Field will be used to compare it with the Object_Rowid. - - setGroupBy: here you can declare a DB-Column that will be used as the new group by of that context. A good example is Order. We want to group by the Ordertype so we have to declare ORDERTYPE as our groupBy. - - If your DB-Value is related to a Keyword you also have to use groupByKeyword and add the Container as Value +* the 360Degree View can only be referenced in the MainViews of the Contexts "Organisation" and "Person" (appearing as tab "360 Degree"); +* the 360Degree View can only include datasets (records) of Contexts having a relation to Context "Contact" (directly or via a "junction Context") - such as the Contexts "Salesproject", "Offer", or "Order" do. -- If you have a Connection of 1:N in your Database Schema (like Task and TaskLink) you have to add specific Properties in your Context Object. Lets take TaskLink as a Example. - - subContext: the Name of the "Link"-Context -> TaskLink - - childField: The Field where the LinkID to your Parent is stored -> TASK_ID - - parentField: The field in your Parent Context where your Connection to your Child is stored -> TASKID - - contactIdField: The Field in the Link Context where your Contactid is stored -> OBJECT_ROWID \ No newline at end of file +[NOTE] +This documentation requires you to be familiar with the "ADITO xRM" project's data model, especially the data structure for managing datasets of persons and companies (i.e., the function of the database tables PERSON, ORGANISATION, and CONTACT - see chapter "Core tables of the xRM project" of the document "Customizing Manual"). + +This documentation will + +* explain the basics of the 360Degree logic, using examples of the ADITO xRM project; +* teach you how you can include further Contexts in the existing 360Degree View implementations, using a plain and hands-on example. + +This documentation does _not_ include a description of how to implement a 360Degree View in the MainView of Contexts _other_ than Organisation and Person. Nevertheless, in principle, you can customize this by yourself, according to you requirements, using the 360 Degree logic as pattern. + +== Basics + +To understand how to modify the behavior of the 360DegreeFilter_view in existing implementations or how to add them to further Contexts, you need to be aware of some basics regarding specific mandatory fields as well as the configuration of specific Provider, Consumer, and Parameters. + +=== RecordContainer + +The core of the 360Degree_entity's logic is the contentProcess of its jDitoRecordContainer. There, a tree (or timeline) structure is created, with + +* the Entities' titles as root nodes +* (if configured, see below:) specific sub-nodes, used for grouping +* the datasets of the Entities on 2nd or, if a grouping applies, on 3rd level + +=== Mandatory settings + +The logic of the jDitoRecordContainer's contentProcess requires the Contexts, which are to be included in the 360Degree View, to have specific EntityFields and properties well-configured. + +==== EntityFields + +The following EntityFields must be present and configured in all Entities whose datasets are to be included in the 360Degree View: + +* ACTIVE ++ +The value of this EntityField determines whether or not a dataset will be shown. Often, the value of this EntityField is being calculated in property "expression" of the corresponding RecordFieldMapping (e.g., via a CASE/WHEN SQL statement). +* DATE_NEW ++ +The value of this EntityField will be used in the ViewTemplate "Timeline". Its calculation follows the standard logic for this EntityField. + +Both EntityFields must be present and named exactly as shown above. Otherwise the logic will fail. + +==== Properties + +The following propertys are not essential, but if they are missing, the appearance of the Context's datasets will be suboptimal: + +* Entity properties: +** contentTitleProcess: ++ +The result of this process will, in this case, appear as "headlines" of the datasets shown in the 360Degree View, including a hyperlink to the datasets' MainView. If this property is not set, the datasets' primary keys will be displayed. +** contentDescriptionProcess: ++ +The result of this process will, in this case, appear as "sub-headlines" of the datasets shown in the 360Degree View. +* Context properties: +** icon/iconProcess: Specifies the icon that will be shown to the left of the headline/sub-headline. Usually, this should be the same icon as the icon of the Entity (i.e., the icon shown in the sidebar, to the left of the client) - except when a grouping (see below) is configured (in this case, the iconProcess should be used, in order to show different icons for each group). + +=== Providers and Consumers + +The dependencies (relations) between the 360Degree Context and the Contexts referencing the 360Degree View in their MainViews is, as usual in ADITO, established via a Provider and a Consumer (one for each dependency). + +==== Providers + +The 360Degree Context must have a Provider to for each dependency, named according to the Pattern `<Context name>Objects`. Examples: + +* OrganisationObjects, for supplying the 360Degree tab in the OrganisationMain_view +* PersonObjects, for supplying the 360Degree tab in the PersonMain_view + +The following property values need to be set (they are the same for each Provider): + +* targetContextField: TARGET_CONTEXT +* targetidField: TARGET_ID +* initFilterMergeMode: AND + +All other Provider properties should usually remain in default state. + +==== Consumers + +The above mentioned Providers need to be referenced by Consumers of the Contexts that show the 360Degree View in their MainView (i.e., currently, only the Contexts "Organisation" and "Person"). + +These Consumers should always be named "360DegreeObjects" (spelling convention, no technical requirement) and have the following properties set: + +* entityName: 360Degree_entity +* fieldName: name of specific provider - e.g., "OrganisationObjects", or "PersonObjects", respectively + +All other Consumer properties should usually remain in default state. + +==== Parameters + +The 360Degree_entity has the following Parameters, each having property "expose" set to true: + +* BaseContextId_param +* ObjectRowId_param +* ObjectStatus_param +* ObjectType_param + +These Parameters have been predefined by the ADITO xRM developers. Never rename them and never change the configuration of their originals under node "Parameters", but only modify their instances appearing under the nodes of the respective 360Degree_entity's Providers or under the Consumers connected to these Providers, respectively. + +===== Provider Parameter settings + +The Parameters "ObjectRowId_param" and "ObjectStatus_param" are configured exclusively on _Consumer_ side (see below). Therefore, leave their instances appearing under node "Providers" in default state (do NOT initialize them). This makes sure that their original property "expose" keeps its value "true", which makes them appear on Consumer side. + +The Parameters "BaseContextId_param" and "ObjectType_param" are configured exclusively on _Provider_ side. Therefore, their instances under the node "Provider" must be initialized and have their property "expose" set to "false". This overwrites the original setting ("true", see above) and thus makes sure that these Parameters do not appear on Consumer side. + +The valueProcesses of the 2 Parameter instances need to be set as follows (all other properties should remain in default state): + +====== BaseContextId_param + +BaseContextId_param's valueProcess must supply the name of the Context, whose MainView should show the 360Degree View. Example: + +.360Degree_entity.OrganisationObjects.BaseContextId_param.valueProcess.js +[source%autofit, javascript] +---- +import("system.result"); + +result.string("Organisation"); +---- + +====== ObjectType_param + +ObjectType_param's valueProcess must supply a JSON String including information about the names of all Contexts to be shown in the 360Degree View. + +Example: +[source%autofit, javascript] +---- +result.string(JSON.stringify({ + "Salesproject": {}, + "Offer": {}, + "Contract": {})); +---- + +(Scroll further down, in order to see the complete example code of a valueProcess. This might help you to understand the following explanations of optional settings better.) + +Optionally, the following features can be specified via JSON properties (included in the curly brackets behind the Context name), separately for each Context: + +* connectionField: The name of the Context's EntityField that works as foreign key pointing to the other side of the relation, i.e., to EntityField CONTACTID of Context "Contact". Example: `"connectionField":"TASK_REQUESTOR_CONTACT_ID"` (enabling to show datasets of Context "SupportTicket"). This property must only be set if its value is other than "CONTACT_ID". +* Grouping: If configured, the datasets of the respective Context are grouped into sub-nodes. +** setGroupBy: This mandatory property specifies the EntityField whose values determine the grouping. Example (belonging to Context "Order"): `"setGroupBy":"ORDERTYPE"` effects a grouping of the "Order" datasets into sub-nodes labelled with the respective value of Order_entity's EntityField ORDERTYPE. +** groupByKeyword (optional): If (as in the above example) the values of the EntityField specified via `setGroupBy` are KeywordEntry keys, then you can optionally specify the corresponding KeywordCategory via property `groupByKeyword`. The effect will be that the grouping nodes will no longer show the KeywordEntries' keys, but their titles. Example: If you specify `"groupByKeyword":"OrderType"`, then "Invoice" (=TITLE) will be shown instead of "ORDTYPEINVO" (= KEYID). +* Junction table: You can specify a Context that works as junction between the Context that shows the 360Degree View and the Context that is to be shown in this View. Example: Context "BulkMailRecipient" works as "junction Context" between the Context "BulkMail" and Context "Contact", in order to enable the user to assign a specific contact (person) to a specific bulk mail. ++ +The configuration of a "junction Context" requires 4 properties to be set: + +** subContext: The name of the "junction Context". Example: `"subContext":"BulkMailRecipient"` +** childField: The name of the EntityField of the subContext that includes the foreign key related to the primary key of the "parent" Context (i.e., of "BulkMail", in our example). Example: `"childField":"BULKMAIL_ID"` +** parentField: The name of the EntityField of the "parent" Context that in cludes the primary key, to which the foreign key of the "child" context relates. Example: `"parentField":"BULKMAILID"` +** contactIdField: The name of the subContext's EntityField that works as foreign key pointing to the other side of the relation, i.e., to EntityField CONTACTID of Context "Contact" (in our example, this is the CONTACTID of the recipient). Example: `"contactIdField":"CONTACT_ID"` + +Example: + +.360Degree_entity.OrganisationObjects.ObjectType_param.valueProcess.js +[source%autofit, javascript] +---- +import("system.vars"); +import("system.result"); + +var res = { + "Salesproject": {}, + "Offer": {}, + "Order": { + "setGroupBy":"ORDERTYPE", + "groupByKeyword":"OrderType" + }, + "Contract": {}, + "SupportTicket": { + "connectionField":"TASK_REQUESTOR_CONTACT_ID", + "setGroupBy":"NameFor360" + }, + "Advertising": {}, + "BulkMail": { + "subContext":"BulkMailRecipient", + "childField":"BULKMAIL_ID", + "parentField":"BULKMAILID", + "contactIdField":"CONTACT_ID" + }, + "SerialLetter": { + "subContext":"LetterRecipient", + "childField":"SERIALLETTER_ID", + "parentField":"SERIALLETTERID", + "contactIdField":"CONTACT_ID" + } +} + +result.string(JSON.stringify(res)) +---- + +===== Consumer Parameter settings + +If set correctly on Provider side (see above), instances of the Parameters "ObjectRowId_param" and "ObjectStatus_param" will appear under each Consumer "360DegreeObjects" (see above). As mentioned before, currently, there are only 2 Contexts having this Consumer: "Organisation" and "Person". + +====== ObjectRowId_param + +This Parameter's valueProcess retrieves (in JSON format) the CONTACTIDs of all involved Contact datasets - i.e., all CONTACTIDs to be used for retrieving the related Contexts' datasets, according to their "connectionField" (= foreign key, which is usually named "CONTACT_ID", but can also have a different name - see description of property "connectionField" above). + +This means, in Context "Person", the result of this valueProcess is simply a JSON String with the CONTACTID connected to the Person dataset: + +.Person_entity.360DegreeObjects.ObjectRowId_param.valueProcess.js +[source%autofit, javascript] +---- +import("system.vars"); +import("system.result"); + +result.string(JSON.stringify([vars.getString("$field.CONTACTID")])); +---- + +In Context "Organisation", the result of this valueProcess is a JSON String including the CONTACTIDs of both the selected company and all persons belonging to this company: + +.Organisation_entity.360DegreeObjects.ObjectRowId_param.valueProcess.js +[source%autofit, javascript] +---- +import("Sql_lib"); +import("system.vars"); +import("system.result"); + +var contactids = newSelect( "CONTACTID" ) + .from("CONTACT") + .where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID")) + .orderBy(new SqlMaskingUtils().isNull("PERSON_ID", "'0'")) + .arrayColumn(); + +result.string(JSON.stringify(contactids)); +---- + +[NOTE] +As already mentioned at the beginning of this documentation, currently, the 360Degree logic is restricted to relations of Contact_entity (i.e., of companies and persons). Therefore, the CONTACTID is the central reference here, as it (exlusively) identifies datasets of companies or persons, respectively. If you want to implement a 360Degree View in the MainView of Contexts _other_ than Organisation and Person, you can use the 360 Degree logic as pattern, but you need to find another EntityField as central reference. + + +====== ObjectStatus_param + +For both instances of Consumer "360Degree" (= in Contexts "Person" and "Organisation"), the result of this Parameter's valueProcess is simply the value of the EntityField holding the state of the selected person/company: + +.Person_entity.360DegreeObjects.ObjectStatus_param.valueProcess.js and Organisation_entity.360DegreeObjects.ObjectStatus_param.valueProcess.js +[source%autofit, javascript] +---- +import("system.vars"); +import("system.result"); + +result.string(vars.get("$field.STATUS")); +---- + +This Parameter's value is evaluated in the stateProcess of 360Degree_entity's ActionGroup "newModule", which controls whether or not the 360Degree View shows a button for creating new datasets for the referenced Contexts (Sales Project, Contract, Order, etc.): If the selected person or company is in state "Inactive" or "To Delete" (i.e., if its EntityField "STATUS" has the keyword-related value "CONTACTSTATINACTIVE" or "CONTACTSTATDELETE"), then this button is disabled. + +== Example for extending 360Degree View + +As a plain and hands-on teaching example, here are the instructions for the task "Include Activity datasets in the 360Degree View of the Contexts Person and Organisation". (By itself, this task is nonsense, of course, because the Activity datasets are already shown in the MainView's tab "Activities". Nevertheless, this task is well-suited to be used for learning purposes.) + +The task should also include a grouping of the Activity records according to Activit_entity's keyword-related EntityField "CATEGORY". + +=== Activity_entity: Mandatory settings + +* Property "contentTitleProcess" is already set: Its result is the value of EntityField "SUBJECT", which perfectly fits for our task. (Beside, you should never change it anyway, as it is also used in other parts of the client.) +* Set property "contentDescriptionProcess" with a reasonable logic. EntityField "INFO" seems to be suitable to be shown below the contentTitle (see above), so the code to be set here is: ++ +.Activity_entity.contentDescriptionProcess.js +[source%autofit, javascript] +---- +import("system.vars"); +import("system.result"); + +result.string(vars.get("$field.INFO")); +---- +* EntityField DATE_NEW is already present, so there is nothing to do. +* Create the new EntityField "ACTIVE". For testing purposes, it is enough to configure the fix value "true", preferably via property "expression" of the respective RecordFieldMapping: ++ +.Activity_entity.db.ACTIVE.value.expression.js +[source%autofit, javascript] +---- +import("system.result"); + +result.string('true'); +---- +* Set the Context's property "icon" to the same icon that appears in the side bar to the left of the client - i.e., in this case, select the icon named "VAADIN:HOURGLASS_END". +* If a grouping according to Activity_entity's EntityField CATEGORY is applied (see below), you may use propertyIcon process for setting code that enables CATEGORY-specific icons to appear beside the grouped datasets. + +=== 360Degree_entity: Extending ObjectType_param + +Extend the JSON configured in the valueProcess of Parameter ObjectType_param of Provider, both for Context "Organisation" and "Person": + +.360Degree_entity.OrganisationObjects.ObjectType_param.valueProcess.js and .360Degree_entity.PersonObjects.ObjectType_param.valueProcess.js +[source%autofit, javascript] +---- +import("system.vars"); +import("system.result"); + +var res = { + "Activity": { + "setGroupBy:":"CATEGORY", + "groupByKeyword":"ActivityCategory", + "subContext":"ActivityLink", + "childField":"ACTIVITY_ID", + "parentField":"ACTIVITYID", + "contactIdField":"OBJECT_ROWID" + }, + "Salesproject": {}, + "Offer": {}, + + (etc...) +} + +result.string(JSON.stringify(res)) +---- + +Now, our task is completed. All other 360Degree-related settings explained in the chapters further above do not require any changes. \ No newline at end of file diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js index 20effae6f92340f071b940437ec00ad1af7db88e..11db39e54492175511a3ae8324e74f76602cdf89 100644 --- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js +++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js @@ -1,3 +1,4 @@ +import("system.neonFilter"); import("system.vars"); import("system.neon"); import("Attribute_lib"); @@ -12,4 +13,4 @@ if (vars.exists("$local.rows")) else if (row[0].ATTRIBUTE_PARENT_ID) params["ParentId_param"] = row[0].ATTRIBUTE_PARENT_ID; } -neon.openContext("Attribute", null, null, neon.OPERATINGSTATE_NEW, params); \ No newline at end of file +neon.openContextWithRecipe("Attribute", null, neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString(), neon.OPERATINGSTATE_NEW); \ No newline at end of file diff --git a/entity/Attribute_entity/entityfields/opendetails/onActionProcess.js b/entity/Attribute_entity/entityfields/opendetails/onActionProcess.js index 20ae8eea182052eb33f1e3bc5a6056d28e7fe2a9..91dcde717777f66d77ffaa0237323f869eddc7a8 100644 --- a/entity/Attribute_entity/entityfields/opendetails/onActionProcess.js +++ b/entity/Attribute_entity/entityfields/opendetails/onActionProcess.js @@ -1,3 +1,4 @@ +import("system.neonFilter"); import("Context_lib"); import("system.vars"); import("system.neon"); @@ -9,4 +10,4 @@ var params = { "ObjectType_param" : vars.get("$param.ObjectType_param") } -neon.openContext("AttributeRelation", "AttributeRelationTreeEdit_view", null, neon.OPERATINGSTATE_NEW, params); \ No newline at end of file +neon.openContextWithRecipe("AttributeRelation", "AttributeRelationTreeEdit_view", neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString(), neon.OPERATINGSTATE_NEW); \ No newline at end of file diff --git a/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod b/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod index 849768b872a9a9a551be334ff3f16ed8b92177c7..e8c992c273347e435d9d87d211eb52b3c36c64ca 100644 --- a/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod +++ b/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod @@ -57,6 +57,7 @@ <name>createAndOpen</name> <title>Create and open in editor</title> <onActionProcess>%aditoprj%/entity/BulkMailAddMosaico_entity/entityfields/createandopen/onActionProcess.js</onActionProcess> + <iconId>NEON:PENCIL</iconId> <stateProcess>%aditoprj%/entity/BulkMailAddMosaico_entity/entityfields/createandopen/stateProcess.js</stateProcess> </entityActionField> <entityParameter> diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod index 421e4597dd6cb4fdfca1e48ca16a787c809585b8..70f7df7f4ad5bf2715a2454845ee7abdbc065921 100644 --- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod +++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod @@ -154,6 +154,7 @@ <entityActionGroup> <name>testRunActions</name> <title>Test Run Actions</title> + <iconId>VAADIN:PAPERPLANE_O</iconId> <stateProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/testrunactions/stateProcess.js</stateProcess> <children> <entityActionField> diff --git a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod index 68c3c1099f025c5435770d12262c0624b1e2d767..63924735b1974f4ff7dfebb2bc68e60d6a548c57 100644 --- a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod +++ b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod @@ -53,7 +53,7 @@ <name>testMail</name> <title>Test email</title> <onActionProcess>%aditoprj%/entity/BulkMailTesting_entity/entityfields/testmail/onActionProcess.js</onActionProcess> - <iconId>VAADIN:CLIPBOARD_CHECK</iconId> + <iconId>VAADIN:PAPERPLANE_O</iconId> </entityActionField> <entityProvider> <name>#PROVIDER_AGGREGATES</name> diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod index 733499d5e6440d8fd26c4721ec19ff966bf7336f..7d370947a623fbbc3218d72e73046c7451c00865 100644 --- a/entity/BulkMail_entity/BulkMail_entity.aod +++ b/entity/BulkMail_entity/BulkMail_entity.aod @@ -161,6 +161,7 @@ <entityParameter> <name>tablenames_param</name> <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess> + <documentation>%aditoprj%/entity/BulkMail_entity/entityfields/loghistories/children/tablenames_param/documentation.adoc</documentation> </entityParameter> </children> </entityConsumer> @@ -532,6 +533,36 @@ <fieldName>#PROVIDER</fieldName> </dependency> </entityConsumer> + <entityField> + <name>ISOLANGUAGE</name> + <title>Language</title> + <consumer>Languages</consumer> + <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/valueProcess.js</valueProcess> + <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess> + </entityField> + <entityField> + <name>dateLastEdit</name> + <title>Edited on</title> + <contentType>DATE</contentType> + </entityField> + <entityField> + <name>userLastEdit</name> + <title>Editor</title> + <contentType>TEXT</contentType> + <groupable v="true" /> + </entityField> + <entityField> + <name>BULKMAIL_OBJECTTYPE</name> + <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmail_objecttype/valueProcess.js</valueProcess> + </entityField> + <entityConsumer> + <name>Languages</name> + <dependency> + <name>dependency</name> + <entityName>Language_entity</entityName> + <fieldName>ISO3Name</fieldName> + </dependency> + </entityConsumer> <entityActionGroup> <name>observeActionoGroup</name> <children> @@ -571,12 +602,6 @@ <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js</stateProcess> <tooltipProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/tooltipProcess.js</tooltipProcess> </entityActionField> - <entityActionField> - <name>testMail</name> - <title>Test email</title> - <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js</onActionProcess> - <iconId>VAADIN:CLIPBOARD_CHECK</iconId> - </entityActionField> <entityActionField> <name>downloadTemplate</name> <title>Download template</title> @@ -604,6 +629,12 @@ <iconId>VAADIN:TOOLS</iconId> <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/newmosaicotemplate/stateProcess.js</stateProcess> </entityActionField> + <entityActionField> + <name>testMail</name> + <title>Test email</title> + <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js</onActionProcess> + <iconId>VAADIN:PAPERPLANE_O</iconId> + </entityActionField> <entityActionField> <name>openAdminView</name> <title>Open admin view</title> @@ -611,36 +642,6 @@ <iconId>VAADIN:CURLY_BRACKETS</iconId> <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/stateProcess.js</stateProcess> </entityActionField> - <entityField> - <name>ISOLANGUAGE</name> - <title>Language</title> - <consumer>Languages</consumer> - <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/valueProcess.js</valueProcess> - <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess> - </entityField> - <entityField> - <name>dateLastEdit</name> - <title>Edited on</title> - <contentType>DATE</contentType> - </entityField> - <entityField> - <name>userLastEdit</name> - <title>Editor</title> - <contentType>TEXT</contentType> - <groupable v="true" /> - </entityField> - <entityField> - <name>BULKMAIL_OBJECTTYPE</name> - <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmail_objecttype/valueProcess.js</valueProcess> - </entityField> - <entityConsumer> - <name>Languages</name> - <dependency> - <name>dependency</name> - <entityName>Language_entity</entityName> - <fieldName>ISO3Name</fieldName> - </dependency> - </entityConsumer> <entityField> <name>CAMPAIGN_ID</name> <title>Campaign</title> diff --git a/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js b/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js index 3c74afcc36fb6b205272bc381bf0a2b025c606c0..837c0929f906f2a682ea55e48e15ac44d7003d70 100644 --- a/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js +++ b/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js @@ -3,6 +3,6 @@ import("system.db"); import("Sql_lib"); ref = {}; -ref[SqlMaskingUtils.prototype.isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW")] = db.DESCENDING; +ref[new SqlMaskingUtils().isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW")] = db.DESCENDING; result.object(ref); \ No newline at end of file diff --git a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js index e8375af86734ceb2389e24ae3b10720d4f60100b..5ea86d6ad7ce14b9b5456f254a67b6de7d5e0bda 100644 --- a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js +++ b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js @@ -1,6 +1,6 @@ import("system.result"); import("Sql_lib"); -var cond = SqlMaskingUtils.prototype.isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW"); +var cond = new SqlMaskingUtils().isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW"); result.string(cond.toString()); \ No newline at end of file diff --git a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js index 2df0709d0bf778d8b5fd119872866d8fa64896d3..d9c759971c59690e61c616fd4d36788c3df5fbe0 100644 --- a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js +++ b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js @@ -1,6 +1,6 @@ import("system.result"); import("Sql_lib"); -var cond = SqlMaskingUtils.prototype.isNull("BULKMAIL.USER_EDIT", "BULKMAIL.USER_NEW"); +var cond = new SqlMaskingUtils().isNull("BULKMAIL.USER_EDIT", "BULKMAIL.USER_NEW"); result.string(cond.toString()); \ No newline at end of file diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod index 8d752e3755b7dc4c2433777c54b289f5c57100a6..3fe8c57bec141b26cb1c10f0269ef400fa01e46c 100644 --- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod +++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod @@ -171,7 +171,7 @@ <title>Update campaign step</title> <onActionProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js</onActionProcess> <isObjectAction v="false" /> - <iconId>NEON:GROUP_APPOINTMENT</iconId> + <iconId>VAADIN:FILE_TREE_SUB</iconId> <state>AUTO</state> <stateProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/stateProcess.js</stateProcess> <tooltip>Update campaign step</tooltip> diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod index bbf180554c656100f88929c9f66e3bcae35d0b9d..e7053a5c96711f36b039d5b36996431848d4f7bd 100644 --- a/entity/CampaignStep_entity/CampaignStep_entity.aod +++ b/entity/CampaignStep_entity/CampaignStep_entity.aod @@ -344,7 +344,7 @@ <name>newCampaignStep</name> <title>New step</title> <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess> - <iconId>NEON:GROUP_APPOINTMENT</iconId> + <iconId>VAADIN:FILE_TREE_SUB</iconId> </entityActionField> <entityParameter> <name>predecessorstepId_param</name> diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod index f35660d768204ecac37a730a700fc63dc880eab0..74cdbb1d533ef85d299420270bff5924b8a018a6 100644 --- a/entity/Campaign_entity/Campaign_entity.aod +++ b/entity/Campaign_entity/Campaign_entity.aod @@ -353,7 +353,7 @@ <name>newCampaignStep</name> <title>New step</title> <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess> - <iconId>NEON:GROUP_APPOINTMENT</iconId> + <iconId>VAADIN:FILE_TREE_SUB</iconId> </entityActionField> <entityConsumer> <name>CampaignAnalysisConsumer</name> diff --git a/entity/Context_entity/entityfields/salesorderlinkeablet/children/blacklist_param/valueProcess.js b/entity/Context_entity/entityfields/salesorderlinkeablet/children/blacklist_param/valueProcess.js deleted file mode 100644 index 1322527cbbdb3bdc8b39b9b566f8c82dc67b33e9..0000000000000000000000000000000000000000 --- a/entity/Context_entity/entityfields/salesorderlinkeablet/children/blacklist_param/valueProcess.js +++ /dev/null @@ -1,3 +0,0 @@ -import("system.result"); - -result.object(["Salesproject", "Salesorder"]); \ No newline at end of file diff --git a/entity/Context_entity/entityfields/salesorderlinkeablet/children/invertblacklist_param/valueProcess.js b/entity/Context_entity/entityfields/salesorderlinkeablet/children/invertblacklist_param/valueProcess.js deleted file mode 100644 index 40effa0178464da0c7850912345f19c7fa95975a..0000000000000000000000000000000000000000 --- a/entity/Context_entity/entityfields/salesorderlinkeablet/children/invertblacklist_param/valueProcess.js +++ /dev/null @@ -1,3 +0,0 @@ -import("system.result"); - -result.string(true); \ No newline at end of file diff --git a/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js b/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js index cd35681842d8c289c2ee2ba1c460101807f63719..6b5b6a7e8f88fd46f3b264475fbd64db26ce8364 100644 --- a/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js +++ b/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js @@ -6,6 +6,6 @@ import("Sql_lib"); if (vars.get("$sys.presentationmode") != neon.CONTEXT_PRESENTATIONMODE_FILTER) { - var excludedIds = $KeywordRegistry.contactStatus$inReview(); + var excludedIds = [$KeywordRegistry.contactStatus$inReview(), $KeywordRegistry.contactStatus$markToDelete()]; result.string(JSON.stringify(excludedIds)); } \ No newline at end of file diff --git a/entity/DistrictResponsible_entity/entityfields/adviserstates/children/blacklistids_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/adviserstates/children/blacklistids_param/valueProcess.js index e8e04e223262820933a9e8ee95ed98788acc7c18..a57e172e388ba75755553f08aca66c1ad47b09bc 100644 --- a/entity/DistrictResponsible_entity/entityfields/adviserstates/children/blacklistids_param/valueProcess.js +++ b/entity/DistrictResponsible_entity/entityfields/adviserstates/children/blacklistids_param/valueProcess.js @@ -1,5 +1,5 @@ import("system.result"); import("KeywordRegistry_basic"); -var excludedIds = [$KeywordRegistry.contactStatus$inReview()]; +var excludedIds = [$KeywordRegistry.contactStatus$inReview(), $KeywordRegistry.contactStatus$markToDelete()]; result.string(JSON.stringify(excludedIds)); \ No newline at end of file diff --git a/entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js b/entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js deleted file mode 100644 index 95bb87fdb7da82091fea21a32071d38935f6f94c..0000000000000000000000000000000000000000 --- a/entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js +++ /dev/null @@ -1,8 +0,0 @@ -import("system.neonFilter"); -import("system.logging"); -import("system.vars"); -import("DocumentTemplate_lib"); -import("system.neon"); - -var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([vars.get("$field.DOCUMENTTEMPLATEID")]).toString(); -neon.openContextWithRecipe("DocumentTemplate", "DocumentTemplateHtmlEdit_view", recipe, neon.OPERATINGSTATE_EDIT); diff --git a/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js deleted file mode 100644 index 718a96109027807c05614a94925ff71302ec524c..0000000000000000000000000000000000000000 --- a/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js +++ /dev/null @@ -1,18 +0,0 @@ -import("KeywordRegistry_basic"); -import("system.result"); -import("system.vars"); -import("DocumentTemplate_lib"); -import("system.neon"); - -var template = DocumentTemplateUtils.getTemplate(vars.get("$field.DOCUMENTTEMPLATEID"), false); -var kind = vars.get("$field.KIND"); - -if (template) -{ - if(template.type == DocumentTemplate.types.HTML && - kind == $KeywordRegistry.documentTemplateType$textModular() || - kind == $KeywordRegistry.documentTemplateType$mail()) - { - result.string(neon.COMPONENTSTATE_EDITABLE); - } -} diff --git a/entity/EmailFilterHandlingSetWorkflow_entity/EmailFilterHandlingSetWorkflow_entity.aod b/entity/EmailFilterHandlingSetWorkflow_entity/EmailFilterHandlingSetWorkflow_entity.aod index df3a2e2f557d0038901b78b39203793d999579a9..8e71c5aa25be1a8748d011b85415f5efe9da95ed 100644 --- a/entity/EmailFilterHandlingSetWorkflow_entity/EmailFilterHandlingSetWorkflow_entity.aod +++ b/entity/EmailFilterHandlingSetWorkflow_entity/EmailFilterHandlingSetWorkflow_entity.aod @@ -34,6 +34,7 @@ <name>SetWorkflow</name> <title>Set workflow</title> <onActionProcess>%aditoprj%/entity/EmailFilterHandlingSetWorkflow_entity/entityfields/setworkflow/onActionProcess.js</onActionProcess> + <iconId>VAADIN:AUTOMATION</iconId> <tooltipProcess>%aditoprj%/entity/EmailFilterHandlingSetWorkflow_entity/entityfields/setworkflow/tooltipProcess.js</tooltipProcess> </entityActionField> <entityParameter> diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod index 657050d20ec94a04c0eff6c74a61d1c7e04bb17e..0b07d9c4f2dee35bdee85f29ad4d896927dcc7e4 100644 --- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod +++ b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod @@ -97,7 +97,6 @@ <title>Place of Use</title> <consumer>ExportTemplatePlacesOfUse</consumer> <mandatory v="true" /> - <onValueChange>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplateplaceofuse_id/onValueChange.js</onValueChange> </entityField> <entityField> <name>placeOfUse</name> diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc b/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc deleted file mode 100644 index 7ff3082082e4138fb3e2b25da143e3099646eb9e..0000000000000000000000000000000000000000 --- a/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc +++ /dev/null @@ -1,9 +0,0 @@ -= ExportTemplate_entity - -Entity to store all the ExportTemplates. -Exporttemplates are used to give the user an easy way to export Data from an table. - -linked via the ExportTemplateId to: --ExportTemplateField_entity to make it possible to store multiple fields for one template --ExportTemplatePlaceOfUse_entity to make it possible to store multiple places of usage for one template --ExportTemplateSelection_entity entity for the selection of the template \ No newline at end of file diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js index 70ac8f02ca1518b3ce375c2f4c5901d08d2c1d4f..9fe0434086d41cf2e95618911ba8d0f003b6fd89 100644 --- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js +++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js @@ -1,5 +1,5 @@ +import("system.tag"); import("system.vars"); -import("system.favorite"); var selected = vars.get("$local.uid"); -favorite.remove(favorite.createRemoveMultipleByIdConfig().setFavoriteRecordIds([selected])); \ No newline at end of file +tag.untag(tag.createUntagMultipleByIdConfig().setFavoriteRecordIds([selected])); \ No newline at end of file diff --git a/entity/InterestLink_entity/InterestLink_entity.aod b/entity/InterestLink_entity/InterestLink_entity.aod index 1ac1a55774b454a22e668a39ab4966681a519086..c77a7c854919994c9024a228a06076dbe41f00d5 100644 --- a/entity/InterestLink_entity/InterestLink_entity.aod +++ b/entity/InterestLink_entity/InterestLink_entity.aod @@ -123,12 +123,10 @@ <dbRecordFieldMapping> <name>INTEREST_ID.value</name> <recordfield>INTERESTLINK.INTEREST_ID</recordfield> - <expression>%aditoprj%/entity/InterestLink_entity/recordcontainers/db/recordfieldmappings/interest_id.value/expression.js</expression> </dbRecordFieldMapping> <dbRecordFieldMapping> <name>INTERESTLINKID.value</name> <recordfield>INTERESTLINK.INTERESTLINKID</recordfield> - <expression>%aditoprj%/entity/InterestLink_entity/recordcontainers/db/recordfieldmappings/interestlinkid.value/expression.js</expression> </dbRecordFieldMapping> <dbRecordFieldMapping> <name>STATUS.value</name> diff --git a/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js b/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js index a7755c7c8e3817c1c4ce2b06c5aed3bf161cccf1..d9df7da703268b6eabb241600751a489d537c699 100644 --- a/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js +++ b/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js @@ -11,10 +11,10 @@ var tagRows = EntityConsumerRowsHelper.getCurrentConsumerRows("TagsByKnowledgeId var tagSet = new Set(); var hasDuplicate = tagRows.some(function (row) { - var tag = row["TAG"].trim(); - if (tagSet.has(tag)) + var tagName = row["TAG"].trim(); + if (tagSet.has(tagName)) return true; - tagSet.add(tag); + tagSet.add(tagName); return false; }); diff --git a/entity/MailLog_entity/MailLog_entity.aod b/entity/MailLog_entity/MailLog_entity.aod index d11a302c48876f498a97e30720bbbe741e33095f..125056661935e1fdbfbcea4038d9d3997b1897e1 100644 --- a/entity/MailLog_entity/MailLog_entity.aod +++ b/entity/MailLog_entity/MailLog_entity.aod @@ -103,6 +103,7 @@ <isMenuAction v="true" /> <isObjectAction v="true" /> <selectionType>MULTI</selectionType> + <iconId>VAADIN:DOWNLOAD</iconId> <tooltipProcess>%aditoprj%/entity/MailLog_entity/entityfields/recipientactions/children/downloademl/tooltipProcess.js</tooltipProcess> </entityActionField> </children> diff --git a/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod b/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod index 2c49610b8c55425f97cbd86bba7e78f36ee03d6e..c383fde4ead08761a0ef434c3febd2abee411964 100644 --- a/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod +++ b/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod @@ -97,31 +97,6 @@ </entityParameter> </children> </entityConsumer> - <entityActionField> - <name>OpenInMosaico</name> - <title>Open in mosaico</title> - <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/onActionProcess.js</onActionProcess> - <iconId>NEON:WRENCH</iconId> - <tooltipProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/tooltipProcess.js</tooltipProcess> - </entityActionField> - <entityActionField> - <name>CopyTemplate</name> - <title>Copy template</title> - <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/copytemplate/onActionProcess.js</onActionProcess> - <iconId>VAADIN:COPY</iconId> - </entityActionField> - <entityActionField> - <name>newBulkMail</name> - <title>Write bulk mail</title> - <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newbulkmail/onActionProcess.js</onActionProcess> - <iconId>VAADIN:AT</iconId> - </entityActionField> - <entityActionField> - <name>newDocumentTemplate</name> - <title>New document template</title> - <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newdocumenttemplate/onActionProcess.js</onActionProcess> - <iconId>VAADIN:FILE_FONT</iconId> - </entityActionField> <entityParameter> <name>CopyMosaicoTemplateIdParam</name> <expose v="true" /> @@ -165,6 +140,31 @@ <mandatory v="true" /> <displayValueProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/category/displayValueProcess.js</displayValueProcess> </entityField> + <entityActionField> + <name>newBulkMail</name> + <title>Write bulk mail</title> + <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newbulkmail/onActionProcess.js</onActionProcess> + <iconId>VAADIN:AT</iconId> + </entityActionField> + <entityActionField> + <name>newDocumentTemplate</name> + <title>New document template</title> + <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newdocumenttemplate/onActionProcess.js</onActionProcess> + <iconId>VAADIN:FILE_FONT</iconId> + </entityActionField> + <entityActionField> + <name>OpenInMosaico</name> + <title>Open in mosaico</title> + <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/onActionProcess.js</onActionProcess> + <iconId>NEON:WRENCH</iconId> + <tooltipProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/tooltipProcess.js</tooltipProcess> + </entityActionField> + <entityActionField> + <name>CopyTemplate</name> + <title>Copy template</title> + <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/copytemplate/onActionProcess.js</onActionProcess> + <iconId>VAADIN:COPY</iconId> + </entityActionField> <entityActionField> <name>openAdminView</name> <documentation>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openadminview/documentation.adoc</documentation> diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/net_discount.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/net_discount.value/expression.js deleted file mode 100644 index bcb815fcaa1266fb0881d287e46dd0849affa9be..0000000000000000000000000000000000000000 --- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/net_discount.value/expression.js +++ /dev/null @@ -1,3 +0,0 @@ -import("system.result"); - -result.string("OFFER.NET * OFFER.DISCOUNT / 100"); diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod index 539426a9accdeccf35ae7df22f09485107038217..d79f7aa05eea2a03bc5ca7c424efba757e1482d5 100644 --- a/entity/Offeritem_entity/Offeritem_entity.aod +++ b/entity/Offeritem_entity/Offeritem_entity.aod @@ -10,6 +10,7 @@ <grantCreateProcess>%aditoprj%/entity/Offeritem_entity/grantCreateProcess.js</grantCreateProcess> <grantUpdateProcess>%aditoprj%/entity/Offeritem_entity/grantUpdateProcess.js</grantUpdateProcess> <grantDeleteProcess>%aditoprj%/entity/Offeritem_entity/grantDeleteProcess.js</grantDeleteProcess> + <afterSave>%aditoprj%/entity/Offeritem_entity/afterSave.js</afterSave> <titlePlural>Offeritems</titlePlural> <recordContainer>db</recordContainer> <entityFields> @@ -24,8 +25,8 @@ <contentType>NUMBER</contentType> <outputFormat>0.00'%'</outputFormat> <inputFormat>0.00</inputFormat> - <titleProcess>%aditoprj%/entity/Offeritem_entity/entityfields/discount/titleProcess.js</titleProcess> <mandatory v="true" /> + <titleProcess>%aditoprj%/entity/Offeritem_entity/entityfields/discount/titleProcess.js</titleProcess> <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/discount/onValidation.js</onValidation> </entityField> <entityField> diff --git a/entity/Offeritem_entity/afterSave.js b/entity/Offeritem_entity/afterSave.js new file mode 100644 index 0000000000000000000000000000000000000000..0fc435de6530b8e80d7e205b331ace1191a336ac --- /dev/null +++ b/entity/Offeritem_entity/afterSave.js @@ -0,0 +1,44 @@ +import("system.neon"); +import("system.entities"); +import("system.vars"); +import("Sql_lib"); + +if(vars.get("$local.recordstate") == neon.OPERATINGSTATE_EDIT) +{ + var offerId = vars.get("$field.OFFER_ID"); + var offerItemUtils = new OfferItemUtils(offerId); + offerItemUtils.initItemTree(); + var childIds = new Set(); + function _traverseChilds(pId) + { + if(!childIds.has(pId)) + { + childIds.add(pId); + if(pId in offerItemUtils.ItemTree) + { + // catch errors if the item tree got calculated while inserting / deleting items + offerItemUtils.ItemTree[pId].ids.forEach(_traverseChilds); + } + } + } + _traverseChilds(vars.get("$sys.uid")); + newWhere("OFFERITEM.OFFERITEMID", Array.from(childIds), SqlBuilder.IN()) + .updateFields({"SHOWPRICE": vars.get("$field.SHOWPRICE")}); + + if(!vars.get("$field.ITEMPOSITION").includes("."))//only the topItems affect the Offer price + { + var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): ""; + var cols = ["NET", "VAT"]; + var vals = offerItemUtils.getNetAndVat(); + var fieldValues = { + NET: vals[0].toString(), + VAT: vals[1].toString() + }; + + var config = entities.createConfigForUpdatingRows(); + config.entity("Offer_entity"); + config.uid(offerId); + config.fieldValues(fieldValues); + entities.updateRow(config); + } +} diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js index 0c21ed1243a9982c6067b1ee46134dfcee02cf88..5a02db4f37aed6f50518823f220499af44fe47e5 100644 --- a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js +++ b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js @@ -6,78 +6,39 @@ import("system.neon"); import("Offer_lib"); import("Sql_lib"); -var offerId = vars.get("$field.OFFER_ID"); -if(offerId != "") +// this processs get's executed for every child of this offerItem since we use writeEntiy, so we use the param to make sure we don't execute it for the children +var newQuanitity = parseFloat(vars.get("$field.QUANTITY")); +var oldQuantity = parseFloat(vars.get("$local.initialRowdata")["OFFERITEM.QUANTITY"]); +var offerItemId = vars.get("$field.OFFERITEMID"); +if(newQuanitity != oldQuantity) //quantity changed -> change quantities of the childitems accordingly { - var offerItemUtils = new OfferItemUtils(offerId); - offerItemUtils.initItemTree(); - var childIds = new Set(); - function _traverseChilds(pId) - { - if(!childIds.has(pId)) - { - childIds.add(pId); - offerItemUtils.ItemTree[pId].ids.forEach(_traverseChilds); - } - } - _traverseChilds(vars.get("$sys.uid")); - newWhere("OFFERITEM.OFFERITEMID", Array.from(childIds), SqlBuilder.IN()) - .updateFields({"SHOWPRICE": vars.get("$field.SHOWPRICE")}); - - if(!vars.get("$field.ITEMPOSITION").includes("."))//only the topItems affect the Offer price - { - var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): ""; - var cols = ["NET", "VAT"]; - var vals = offerItemUtils.getNetAndVat(); - var fieldValues = { - NET: vals[0].toString(), - VAT: vals[1].toString() - }; - - var config = entities.createConfigForUpdatingRows(); - config.entity("Offer_entity"); - config.uid(offerId); - config.fieldValues(fieldValues); - entities.updateRow(config); - } - - //this process get's executed for every child of this offerItem since we use writeEntiy, so we use the param to make sure we don't execute it for the children - if(vars.getString("$param.IgnoreOnUpdateProcess_param") != "true") - { - var newQuanitity = parseFloat(vars.get("$field.QUANTITY")); - var oldQuantity = parseFloat(vars.get("$local.initialRowdata")["OFFERITEM.QUANTITY"]); - var offerItemId = vars.get("$field.OFFERITEMID"); - if(newQuanitity != oldQuantity) //quantity changed -> change quantities of the childitems accordingly - { - var multiplier = newQuanitity/oldQuantity; + var multiplier = newQuanitity/oldQuantity; - var loadConfig = entities.createConfigForLoadingRows().entity("Offeritem_entity").addParameter("OfferId_param", offerId).fields(["OFFERITEMID", "ASSIGNEDTO", "PRODUCT_ID", "QUANTITY"]) + var loadConfig = entities.createConfigForLoadingRows().entity("Offeritem_entity").addParameter("OfferId_param", vars.get("$field.OFFER_ID")).fields(["OFFERITEMID", "ASSIGNEDTO", "PRODUCT_ID", "QUANTITY"]) - var rows = entities.getRows(loadConfig); - var potentialAsignees = {}; - var offerItemsToUpdate = {}; - var statements = []; - var stop = false; - while(stop == false)//we have too loop for all the rows for each row that needs updating, since those are also pontially asignees + var rows = entities.getRows(loadConfig); + var potentialAsignees = {}; + var offerItemsToUpdate = {}; + var statements = []; + var stop = false; + while(stop == false)//we have too loop for all the rows for each row that needs updating, since those are also pontially asignees + { + stop = true; + for(var offeritem in rows)//loop trough all the rows and build offerItemsToUpdate + { + if(!(rows[offeritem]["OFFERITEMID"] in offerItemsToUpdate) &&(rows[offeritem]["ASSIGNEDTO"] == offerItemId || rows[offeritem]["ASSIGNEDTO"] in potentialAsignees)) { - stop = true; - for(var offeritem in rows)//loop trough all the rows and build offerItemsToUpdate - { - if(!(rows[offeritem]["OFFERITEMID"] in offerItemsToUpdate) &&(rows[offeritem]["ASSIGNEDTO"] == offerItemId || rows[offeritem]["ASSIGNEDTO"] in potentialAsignees)) - { - statements.push( - newWhere("OFFERITEM.OFFERITEMID", rows[offeritem]["OFFERITEMID"]).buildUpdateStatement({ - "QUANTITY": parseInt(rows[offeritem]["QUANTITY"])*multiplier - }) - ); - offerItemsToUpdate[rows[offeritem]["OFFERITEMID"]] = parseInt(rows[offeritem]["QUANTITY"])*multiplier; - potentialAsignees[rows[offeritem]["OFFERITEMID"]] = ""; + statements.push( + newWhere("OFFERITEM.OFFERITEMID", rows[offeritem]["OFFERITEMID"]).buildUpdateStatement({ + "QUANTITY": parseInt(rows[offeritem]["QUANTITY"])*multiplier + }) + ); + offerItemsToUpdate[rows[offeritem]["OFFERITEMID"]] = parseInt(rows[offeritem]["QUANTITY"])*multiplier; + potentialAsignees[rows[offeritem]["OFFERITEMID"]] = ""; - stop = false; - } - } + stop = false; } - db.execute(statements);// no write entity -> performance reason } } + db.execute(statements);// no write entity -> performance reason } diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod index a22087028d3fb3ac617b40b7989e5cb94a5b6d3b..2dc1a55d4ab8f98ee61dcf266876cb12414bb061 100644 --- a/entity/Orderitem_entity/Orderitem_entity.aod +++ b/entity/Orderitem_entity/Orderitem_entity.aod @@ -10,6 +10,7 @@ <grantCreateProcess>%aditoprj%/entity/Orderitem_entity/grantCreateProcess.js</grantCreateProcess> <grantUpdateProcess>%aditoprj%/entity/Orderitem_entity/grantUpdateProcess.js</grantUpdateProcess> <grantDeleteProcess>%aditoprj%/entity/Orderitem_entity/grantDeleteProcess.js</grantDeleteProcess> + <afterSave>%aditoprj%/entity/Orderitem_entity/afterSave.js</afterSave> <titlePlural>Orderitems</titlePlural> <recordContainer>db</recordContainer> <entityFields> @@ -24,9 +25,9 @@ <contentType>NUMBER</contentType> <outputFormat>0.00'%'</outputFormat> <inputFormat>0.00</inputFormat> + <mandatory v="true" /> <titleProcess>%aditoprj%/entity/Orderitem_entity/entityfields/discount/titleProcess.js</titleProcess> <onValidation>%aditoprj%/entity/Orderitem_entity/entityfields/discount/onValidation.js</onValidation> - <mandatory v="true" /> </entityField> <entityField> <name>GROUPCODEID</name> diff --git a/entity/Orderitem_entity/afterSave.js b/entity/Orderitem_entity/afterSave.js new file mode 100644 index 0000000000000000000000000000000000000000..6025f5a1c7b7a29b289a59e64cf962741de7efb9 --- /dev/null +++ b/entity/Orderitem_entity/afterSave.js @@ -0,0 +1,24 @@ +import("system.neon"); +import("system.vars"); +import("system.entities"); +import("Order_lib"); + +if(vars.get("$local.recordstate") == neon.OPERATINGSTATE_EDIT) +{ + var oid = vars.get("$field.SALESORDER_ID"); + var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): ""; + var cols = ["NET", "VAT"]; + var oiUtils = new OrderItemUtils(oid); + var vals = oiUtils.getNetAndVat(); + + var fieldValues = { + NET: vals[0].toString(), + VAT: vals[1].toString() + }; + + var config = entities.createConfigForUpdatingRows(); + config.entity("Order_entity"); + config.uid(oid); + config.fieldValues(fieldValues); + entities.updateRow(config); +} diff --git a/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js b/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js index d96eedd5e3d6e49302083d0d3ba84dee5874bdc1..b895f0d7cd0bd3edbf0cdc28a900204644013cd3 100644 --- a/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js +++ b/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js @@ -5,66 +5,43 @@ import("system.db"); import("system.neon"); import("Order_lib"); import("Sql_lib"); - -var oid = vars.get("$field.SALESORDER_ID"); -if(oid != "") -{ - if(!vars.get("$field.ITEMPOSITION").includes("."))//only the topItems affect the Order price - { - var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): ""; - var cols = ["NET", "VAT"]; - var oiUtils = new OrderItemUtils(oid); - var vals = oiUtils.getNetAndVat(); - var fieldValues = { - NET: vals[0].toString(), - VAT: vals[1].toString() - }; - - var config = entities.createConfigForUpdatingRows(); - config.entity("Order_entity"); - config.uid(oid); - config.fieldValues(fieldValues); - entities.updateRow(config); - } - - //this process get's executed for every child of this orderItem since we use writeEntiy, so we use the param to make sure we don't execute it for the children - if(vars.getString("$param.IgnoreOnUpdateProcess_param") != "true") +//this process get's executed for every child of this orderItem since we use writeEntiy, so we use the param to make sure we don't execute it for the children +if(vars.getString("$param.IgnoreOnUpdateProcess_param") != "true") +{ + var newQuanitity = parseFloat(vars.get("$field.QUANTITY")); + var oldQuantity = parseFloat(vars.get("$local.initialRowdata")["SALESORDERITEM.QUANTITY"]); + var orderItemId = vars.get("$field.SALESORDERITEMID"); + if(newQuanitity != oldQuantity) //quantity changed -> change quantities of the childitems accordingly { - var newQuanitity = parseFloat(vars.get("$field.QUANTITY")); - var oldQuantity = parseFloat(vars.get("$local.initialRowdata")["SALESORDERITEM.QUANTITY"]); - var orderItemId = vars.get("$field.SALESORDERITEMID"); - if(newQuanitity != oldQuantity) //quantity changed -> change quantities of the childitems accordingly - { - var multiplier = newQuanitity/oldQuantity; + var multiplier = newQuanitity/oldQuantity; - var loadConfig = entities.createConfigForLoadingRows().entity("Orderitem_entity").addParameter("OrderId_param", oid).fields(["SALESORDERITEMID", "ASSIGNEDTO", "PRODUCT_ID", "QUANTITY"]) + var loadConfig = entities.createConfigForLoadingRows().entity("Orderitem_entity").addParameter("OrderId_param", vars.get("$field.SALESORDER_ID")).fields(["SALESORDERITEMID", "ASSIGNEDTO", "PRODUCT_ID", "QUANTITY"]) - var rows = entities.getRows(loadConfig); - var potentialAsignees = {}; - var orderItemsToUpdate = {}; - var statements = []; - var stop = false; - while(stop == false)//we have too loop for all the rows for each row that needs updating, since those are also pontially asignees + var rows = entities.getRows(loadConfig); + var potentialAsignees = {}; + var orderItemsToUpdate = {}; + var statements = []; + var stop = false; + while(stop == false)//we have too loop for all the rows for each row that needs updating, since those are also pontially asignees + { + stop = true; + for(var orderitem in rows)//loop trough all the rows and build orderItemsToUpdate { - stop = true; - for(var orderitem in rows)//loop trough all the rows and build orderItemsToUpdate + if(!(rows[orderitem]["SALESORDERITEMID"] in orderItemsToUpdate) &&(rows[orderitem]["ASSIGNEDTO"] == orderItemId || rows[orderitem]["ASSIGNEDTO"] in potentialAsignees)) { - if(!(rows[orderitem]["SALESORDERITEMID"] in orderItemsToUpdate) &&(rows[orderitem]["ASSIGNEDTO"] == orderItemId || rows[orderitem]["ASSIGNEDTO"] in potentialAsignees)) - { - statements.push( - newWhere("SALESORDERITEM.SALESORDERITEMID", rows[orderitem]["SALESORDERITEMID"]).buildUpdateStatement({ - "QUANTITY": parseInt(rows[orderitem]["QUANTITY"])*multiplier - }) - ); - orderItemsToUpdate[rows[orderitem]["SALESORDERITEMID"]] = parseInt(rows[orderitem]["QUANTITY"])*multiplier; - potentialAsignees[rows[orderitem]["SALESORDERITEMID"]] = ""; + statements.push( + newWhere("SALESORDERITEM.SALESORDERITEMID", rows[orderitem]["SALESORDERITEMID"]).buildUpdateStatement({ + "QUANTITY": parseInt(rows[orderitem]["QUANTITY"])*multiplier + }) + ); + orderItemsToUpdate[rows[orderitem]["SALESORDERITEMID"]] = parseInt(rows[orderitem]["QUANTITY"])*multiplier; + potentialAsignees[rows[orderitem]["SALESORDERITEMID"]] = ""; - stop = false; - } + stop = false; } } - db.execute(statements);// no write entity -> performance reason } + db.execute(statements);// no write entity -> performance reason } } diff --git a/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js index 0b40c848fa60b7da8c8d595cb20d5588634d897b..d96a095d6b79ce429fd23cf569cbf657be1c69ab 100644 --- a/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js +++ b/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js @@ -1,4 +1,5 @@ -import("KeywordRegistry_basic"); import("system.result"); +import("KeywordRegistry_basic"); -result.object([]); \ No newline at end of file +var excludedIds = [$KeywordRegistry.contactStatus$markToDelete()]; +result.string(JSON.stringify(excludedIds)); \ No newline at end of file diff --git a/entity/Organisation_entity/entityfields/newsupportticket/onActionProcess.js b/entity/Organisation_entity/entityfields/newsupportticket/onActionProcess.js deleted file mode 100644 index 17dc629c2371efc399be5f7d143f3533fae661e1..0000000000000000000000000000000000000000 --- a/entity/Organisation_entity/entityfields/newsupportticket/onActionProcess.js +++ /dev/null @@ -1,5 +0,0 @@ -import("system.vars"); -import("Ticket_lib"); - - -TicketUtils.openNewSupportticketWithLinks( [["Organisation", vars.get( "$field.CONTACTID")]]); \ No newline at end of file diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod index faf9f0c2fbb11915157cf4f8619df56c47b9c26a..482f939243f6babf1f4767cefb2e68a17b2cf774 100644 --- a/entity/Person_entity/Person_entity.aod +++ b/entity/Person_entity/Person_entity.aod @@ -405,7 +405,6 @@ <name>STANDARD_PHONE_COMMUNICATION</name> <title>Phone</title> <consumer>PhoneCommunications</consumer> - <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/displayValueProcess.js</displayValueProcess> <onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange> </entityField> <entityConsumer> diff --git a/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js b/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js index 0b40c848fa60b7da8c8d595cb20d5588634d897b..d96a095d6b79ce429fd23cf569cbf657be1c69ab 100644 --- a/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js +++ b/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js @@ -1,4 +1,5 @@ -import("KeywordRegistry_basic"); import("system.result"); +import("KeywordRegistry_basic"); -result.object([]); \ No newline at end of file +var excludedIds = [$KeywordRegistry.contactStatus$markToDelete()]; +result.string(JSON.stringify(excludedIds)); \ No newline at end of file diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod index bf2d0e8493d6330b1ae9d73060dbfd7f923dd462..3ecb7cb6b0fcd9d1ef8bfd2794037bea65b12cf4 100644 --- a/entity/Product_entity/Product_entity.aod +++ b/entity/Product_entity/Product_entity.aod @@ -693,7 +693,6 @@ </dbRecordFieldMapping> <dbRecordFieldMapping> <name>STATUS_TILEVIEW.displayValue</name> - <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/statustileview.displayvalue/expression.js</expression> </dbRecordFieldMapping> <dbRecordFieldMapping> <name>ADVERTISING_TILEVIEW.value</name> diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod index 0db66c9d524d439aaf80431e2d60789bc181eb30..a081ee4d02e6b532a138f30a8be320a9031b97e7 100644 --- a/entity/QuickEntry_entity/QuickEntry_entity.aod +++ b/entity/QuickEntry_entity/QuickEntry_entity.aod @@ -32,7 +32,7 @@ <children> <entityParameter> <name>ObjectRowId_param</name> - <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess> + <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/communications/children/objectrowid_param/valueProcess.js</valueProcess> </entityParameter> <entityParameter> <name>ObjectType_param</name> @@ -233,7 +233,7 @@ <documentation>%aditoprj%/entity/QuickEntry_entity/entityfields/personcontactids_param/documentation.adoc</documentation> </entityParameter> <entityConsumer> - <name>Service tickets</name> + <name>ServiceTickets</name> <dependency> <name>dependency</name> <entityName>SupportTicket_entity</entityName> diff --git a/entity/QuickEntry_entity/entityfields/communications/children/contactid_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/communications/children/objectrowid_param/valueProcess.js similarity index 100% rename from entity/QuickEntry_entity/entityfields/communications/children/contactid_param/valueProcess.js rename to entity/QuickEntry_entity/entityfields/communications/children/objectrowid_param/valueProcess.js diff --git a/entity/QuickEntry_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js index dc28dd1668428cd72a6afb49c02147bd36f8ba42..e0f3ec47e2b963a577204e41d9847dd6ad0725a8 100644 --- a/entity/QuickEntry_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js +++ b/entity/QuickEntry_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js @@ -1,4 +1,3 @@ import("system.result"); - -result.string( false); \ No newline at end of file +result.string(false); \ No newline at end of file diff --git a/entity/QuickEntry_entity/entityfields/supporttickets/children/returnempty_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/supporttickets/children/returnempty_param/valueProcess.js deleted file mode 100644 index b691020ed6224d159383287eb2b841b9d5d225bd..0000000000000000000000000000000000000000 --- a/entity/QuickEntry_entity/entityfields/supporttickets/children/returnempty_param/valueProcess.js +++ /dev/null @@ -1,4 +0,0 @@ -import("system.result"); - - -result.string( true); \ No newline at end of file diff --git a/entity/QuickEntry_entity/entityfields/supporttickets/children/taskrequestorcontactid_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/supporttickets/children/taskrequestorcontactid_param/valueProcess.js deleted file mode 100644 index 16c85500b5355a72548030867e3d300661e9d4aa..0000000000000000000000000000000000000000 --- a/entity/QuickEntry_entity/entityfields/supporttickets/children/taskrequestorcontactid_param/valueProcess.js +++ /dev/null @@ -1,4 +0,0 @@ -import("system.vars"); -import("system.result"); - -result.string(vars.get("$field.UID")); \ No newline at end of file diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index ff7f6cbe34e6b06d62d6be56fc468277910e8119..08c5f993e915b02599172230abbf143418f26843 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -1063,7 +1063,6 @@ <aggregateFieldDbMapping> <name>volumeWeighted_aggregate.value</name> <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volumeweighted_aggregate.value/expression.js</expression> - <aggregateType>AVG</aggregateType> </aggregateFieldDbMapping> <dbRecordFieldMapping> <name>MST_TEAM_ID.displayValue</name> diff --git a/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod b/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod index e91a4c5f39a803af31846213648d3a6a13e4605d..f280f65fbc251b83f419fd0af5061f17965199d7 100644 --- a/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod +++ b/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod @@ -38,7 +38,6 @@ <entityField> <name>email_address</name> <title>Email address</title> - <mandatory v="true" /> <dropDownProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js</dropDownProcess> <textInputAllowed v="true" /> <valueProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/email_address/valueProcess.js</valueProcess> diff --git a/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js b/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js index 70bdc8be7d3596381114e66c64df05ac64e8c376..cecd4d2fdadf968f2dab6efb197a65d29c04fe0e 100644 --- a/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js +++ b/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js @@ -4,7 +4,7 @@ import("Communication_lib"); var fn = CommValidationUtil.makeValidationFn("EMAIL"); -if (fn != null) +if (fn != null && vars.get("$local.value") != "") { var commAddr = vars.get("$local.value"); var res = fn.call(null, commAddr, null); diff --git a/entity/ServiceEmail_entity/entityfields/recipients_tolooku/children/actionname/valueProcess.js b/entity/ServiceEmail_entity/entityfields/recipients_tolooku/children/actionname/valueProcess.js deleted file mode 100644 index b1c1aeb894bea017b9e5478561706feb6daeb98f..0000000000000000000000000000000000000000 --- a/entity/ServiceEmail_entity/entityfields/recipients_tolooku/children/actionname/valueProcess.js +++ /dev/null @@ -1,4 +0,0 @@ -import("system.vars"); -import("system.result"); - -result.string( vars.get( "$param.ActionName_param")); \ No newline at end of file diff --git a/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js b/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js index 7bf43f8059cadfb954c8c13675165b4db855cb25..3784f83b59cc269d36275b9f018b856f7e9503a7 100644 --- a/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js +++ b/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js @@ -214,6 +214,7 @@ if(returnedMsgAfterSend == true) if( str_conclusion && [ $KeywordRegistry.taskStatus$ended(),$KeywordRegistry.taskStatus$endedAbandoned(),$KeywordRegistry.taskStatus$endedDone()].includes(str_ticketStatusAfterSend) != -1) { TicketfieldValues["CONCLUSION"] = str_conclusion; + TicketfieldValues["DATE_END"] = vars.get("sys.date"); } TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date"); diff --git a/entity/SlaveAdministration_entity/entityfields/filterviewactiongroup/children/intervalset/onActionProcess.js b/entity/SlaveAdministration_entity/entityfields/filterviewactiongroup/children/intervalset/onActionProcess.js index 63b9ac5eddf0420845c1b9ced2eeac6bc0c221b7..f06caae5e33b75e8f74212fcaaebfe93ba4baea5 100644 --- a/entity/SlaveAdministration_entity/entityfields/filterviewactiongroup/children/intervalset/onActionProcess.js +++ b/entity/SlaveAdministration_entity/entityfields/filterviewactiongroup/children/intervalset/onActionProcess.js @@ -1,3 +1,4 @@ +import("system.neonFilter"); import("system.vars"); import("system.neon"); @@ -6,5 +7,5 @@ if (selection.length > 0) { var params = {}; params["SlaveUIDs_param"] = JSON.stringify(vars.get("$sys.selection")); - neon.openContext("SlaveAdministrationIntervall", "SlaveAdminstrationIntervallEdit_view", null, neon.OPERATINGSTATE_VIEW, params); + neon.openContextWithRecipe("SlaveAdministrationIntervall", "SlaveAdminstrationIntervallEdit_view", neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString(), neon.OPERATINGSTATE_VIEW); } \ No newline at end of file diff --git a/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod b/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod index c8daea565749df730da1358a2480166421e75c80..80f273144dab1fa062b65dc70ba2adfd01446f94 100644 --- a/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod +++ b/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod @@ -103,6 +103,7 @@ <name>ChangeData</name> <title>Save changes</title> <onActionProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js</onActionProcess> + <iconId>NEON:RECURRING_APPOINTMENT</iconId> <titleProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/changedata/titleProcess.js</titleProcess> </entityActionField> <entityProvider> diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js index cb9344c6c3a12a31ae9a9fc2a7291e22209dd797..fb46c8c31841634d71df5e45eee6e0a5fe2d1b4b 100644 --- a/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js +++ b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js @@ -1,8 +1,6 @@ import("system.question"); -import("system.logging"); import("system.neon"); import("Employee_lib"); -import("ActivityTask_lib"); import("Sql_lib"); import("Contact_lib"); import("KeywordRegistry_basic"); @@ -17,7 +15,6 @@ var TaskfieldValues = {}; var TaskfieldValueStatus = {}; var TicketfieldValues = {}; var obj_toolsUser = tools.getCurrentUser()[tools.PARAMS]; -var activityContent = []; var ChangeCounter = 0; var removedIds; @@ -25,7 +22,6 @@ var removedIds; if(vars.exists("$field.PRIORITY") && (vars.get("$field.PRIORITY") != "" )) { TaskfieldValues["PRIORITY"] = vars.get("$field.PRIORITY"); - activityContent += translate.text("Priority changed to") + ": " + KeywordUtils.getViewValue($KeywordRegistry.taskPriority(), vars.get("$field.PRIORITY")); } /// STATUS if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" )) @@ -65,13 +61,7 @@ if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" )) TicketfieldValues["DATE_END"] = vars.get("$sys.date"); TicketfieldValues["CONCLUSION"] = vars.get("$field.CONCLUSION"); } - if(activityContent != "") - { - activityContent += " / " - } - activityContent += translate.text("Status changed to") + ": " + KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), vars.get("$field.STATUS")); - - TaskfieldValue["STATUS"] = vars.get("$field.STATUS"); + TaskfieldValues["STATUS"] = vars.get("$field.STATUS"); TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date"); } } @@ -79,23 +69,11 @@ if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" )) if(vars.exists("$field.EDITOR_CONTACT_ID") && (vars.get("$field.EDITOR_CONTACT_ID") != "" )) { TicketfieldValues["EDITOR_CONTACT_ID"] = vars.get("$field.EDITOR_CONTACT_ID"); - if(activityContent != "") - { - activityContent += " / " - } - activityContent += translate.text("Editor changed to") + ": " + ContactUtils.getFullTitleByContactId(vars.get("$field.EDITOR_CONTACT_ID"),false); - } /// CATEGORY if(vars.exists("$field.CATEGORY") && (vars.get("$field.CATEGORY") != "" )) { TicketfieldValues["CATEGORY"] = vars.get("$field.CATEGORY"); - if(activityContent != "") - { - activityContent += " / " - } - activityContent += translate.text("Category changed to") + ": " + KeywordUtils.getViewValue($KeywordRegistry.ticketCategory(), vars.get("$field.CATEGORY")); - } /// UPDATE TICKET & TASK @@ -119,8 +97,8 @@ if (ChangeCounter > 1) if (ChangeCounter == 1) { question.showMessage(translate.text("You tried to change the status of a ticket from 'ended' to another status.") - + " " + translate.text("The status-change of these tickets was skipped. Any other changes were carried out.") + + " " + translate.text("The status-change of the ticket was skipped. Any other changes were carried out.") + " " + translate.text("To re-open tickets, please use the corresponding action."), question.INFORMATION, translate.text("Status change skipped!")); } neon.closeImage(vars.get("$sys.currentimage"), true) -neon.refresh(); +neon.refreshAll(); diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js b/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js index 2bacab3ce0a5b9a34fa1e1205a7264abfb17ce02..e573a5d478f1b9d9aff85e54093004b1f6c4a009 100644 --- a/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js +++ b/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js @@ -38,9 +38,9 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) if (vars.get("$field.INBOX_ID")) { var mailsig = newSelect("MAILSIGNATURE.MAILSIGNATUREID") - .from("MAILSIGNATURE") - .where("MAILSIGNATURE.INBOX_ID",vars.get("$field.INBOX_ID")) - .cell(); + .from("MAILSIGNATURE") + .where("MAILSIGNATURE.INBOX_ID",vars.get("$field.INBOX_ID")) + .cell(); TicketfieldValues["MAILSIGNATURE_ID"] = mailsig; } @@ -51,7 +51,6 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) if ( (actionName == "sendTicketBackAction") || (actionName == "changeStatusAfterForwardEmail")) { newWhereIfSet("TICKET.TICKETID", vars.get("field.TICKETID")).updateFields(TicketfieldValues); - neon.openHome(); } ///RESUBMIT TICKETS else if( actionName == "resubmitTicket") @@ -66,16 +65,16 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) "directionKeywordId" : $KeywordRegistry.activityDirection$internal(), "subject" : translate.text("Ticket resubmitted"), "content" : translate.text("New date due") + ": " - + datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), "dd.MM.yyyy") + " " - + translate.text("Editor changed to") + ": " - + ContactUtils.getFullTitleByContactId(vars.get("$field.TICKET_EDITOR_CONTACT_ID"),false), + + datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), "dd.MM.yyyy") + " " + + translate.text("Editor changed to") + ": " + + ContactUtils.getFullTitleByContactId(vars.get("$field.TICKET_EDITOR_CONTACT_ID"),false), "categoryKeywordId" : $KeywordRegistry.activityCategory$sys(), "responsibleContactId" : EmployeeUtils.getCurrentContactId() } var ActivityLink = [ContextUtils.getCurrentContextId(), ticketID]; ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]); - // end ACTIVITY + // end ACTIVITY } ///RETURN TICKETS @@ -88,7 +87,7 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) "directionKeywordId" : $KeywordRegistry.activityDirection$internal(), "subject" : translate.text("Ticket returned"), "content" : translate.text("Ticket returned to pool") + ". " - +"\n"+ translate.text("Original editor") + ": " + vars.get( "$field.TICKET_EDITOR_CONTACT_ID.displayValue"), + +"\n"+ translate.text("Original editor") + ": " + vars.get( "$field.TICKET_EDITOR_CONTACT_ID.displayValue"), "categoryKeywordId" : $KeywordRegistry.activityCategory$sys(), "responsibleContactId" : EmployeeUtils.getCurrentContactId() } @@ -102,7 +101,7 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date"); TicketfieldValues["INBOX_ID"] = vars.get("$field.INBOX_ID"); TicketfieldValues["CATEGORY"] = vars.get("$field.TICKETCATEGORY"); - } + } newWhere("TICKET.TICKETID","$field.TICKETID").updateFields(TicketfieldValues); newWhere("TASK.TASKID", "$field.TASK_ID").updateFields(TaskfieldValues); } diff --git a/entity/Weblink_entity/Weblink_entity.aod b/entity/Weblink_entity/Weblink_entity.aod index ba40c32758c338e9b683a319b8a4e7aa3b00a991..e263ae195e479bda5863a57b9934491540590a36 100644 --- a/entity/Weblink_entity/Weblink_entity.aod +++ b/entity/Weblink_entity/Weblink_entity.aod @@ -206,6 +206,28 @@ <title>Last Click</title> <contentType>DATE</contentType> </entityField> + <entityActionField> + <name>openAdminView</name> + <title>Open admin view</title> + <onActionProcess>%aditoprj%/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js</onActionProcess> + <iconId>VAADIN:CURLY_BRACKETS</iconId> + <stateProcess>%aditoprj%/entity/Weblink_entity/entityfields/openadminview/stateProcess.js</stateProcess> + </entityActionField> + <entityConsumer> + <name>LogHistories</name> + <dependency> + <name>dependency</name> + <entityName>LogHistory_entity</entityName> + <fieldName>LogHistoryProvider</fieldName> + </dependency> + <children> + <entityParameter> + <name>tablenames_param</name> + <valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess> + <documentation>%aditoprj%/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/documentation.adoc</documentation> + </entityParameter> + </children> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> @@ -296,7 +318,7 @@ </dbRecordFieldMapping> <dbRecordFieldMapping> <name>userLastChange.value</name> - <expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlstchange.value/expression.js</expression> + <expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlastchange.value/expression.js</expression> <isFilterable v="true" /> </dbRecordFieldMapping> <dbRecordFieldMapping> @@ -304,6 +326,10 @@ <expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastclick.value/expression.js</expression> <isFilterable v="true" /> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>ACTION_TYPE.displayValue</name> + <expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js</expression> + </dbRecordFieldMapping> </recordFieldMappings> <linkInformation> <linkInformation> diff --git a/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js b/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..4e5484c53bfd9839d54f6b49a8fa1e5ee6bdc81b --- /dev/null +++ b/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js @@ -0,0 +1,9 @@ +import("system.vars"); +import("system.result"); +import("Context_lib"); + +var res = []; +res.push({id: vars.get("$field.WEBLINKID"), tableNames: ["WEBLINK"]}); + +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/Weblink_entity/entityfields/openadminview/onActionProcess.js b/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..b5f5e2e14661caad5c0c4eed47e503e2f5f4b2ba --- /dev/null +++ b/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js @@ -0,0 +1,11 @@ +import("system.vars"); +import("Context_lib"); + + + +AdminViewUtils.open("WEBLINKID", [ + ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"], + ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"], + ["USER_NEW", vars.get("$field.USER_NEW")], + ["USER_EDIT", vars.get("$field.USER_EDIT")] +]); \ No newline at end of file diff --git a/entity/Weblink_entity/entityfields/openadminview/stateProcess.js b/entity/Weblink_entity/entityfields/openadminview/stateProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..38f2298db7304b4d44a15fbad7f720558c02da99 --- /dev/null +++ b/entity/Weblink_entity/entityfields/openadminview/stateProcess.js @@ -0,0 +1,4 @@ +import("Context_lib"); +import("system.result"); + +result.string(AdminViewUtils.getActionState()); \ No newline at end of file diff --git a/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js b/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js index f3aa364a806fc472dbf0dce26576d5cbabe82b3d..2e069f777aa1a112c9cdb37baa7bb3d72746e986 100644 --- a/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js +++ b/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js @@ -3,6 +3,6 @@ import("system.result"); import("Sql_lib"); var ret = {}; -ret[SqlMaskingUtils.prototype.isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW")] = db.DESCENDING; +ret[new SqlMaskingUtils().isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW")] = db.DESCENDING; result.object(ret); \ No newline at end of file diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js new file mode 100644 index 0000000000000000000000000000000000000000..5f4573dc27b744862ef193913294c1d4f4607ff7 --- /dev/null +++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js @@ -0,0 +1,5 @@ +import("system.result"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); + +result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.weblinkActionType(), "WEBLINK.ACTION_TYPE")); \ No newline at end of file diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js index 02a47dbbaf0dcf516217ec4f65a2a0d310f8c1e3..ac99863a915cabdb31357539d6bcdf17a4eec004 100644 --- a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js +++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js @@ -1,6 +1,6 @@ import("system.result"); import("Sql_lib"); -var cond = SqlMaskingUtils.prototype.isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW"); +var cond = new SqlMaskingUtils().isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW"); result.string(cond); \ No newline at end of file diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlastchange.value/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlastchange.value/expression.js new file mode 100644 index 0000000000000000000000000000000000000000..eb2cdf0df266469729e5484e8da7621f436dfa82 --- /dev/null +++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlastchange.value/expression.js @@ -0,0 +1,6 @@ +import("system.result"); +import("Sql_lib"); + +var cond = new SqlMaskingUtils().isNull("WEBLINK.USER_EDIT", "WEBLINK.USER_NEW"); + +result.string(cond); \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index cec103c6c74f7af2597181925947c695b6eb40e9..cf8bc1d46415f9346041762ae1ec45147a4cb542 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -11231,6 +11231,9 @@ <entry> <key>Discount in %0</key> </entry> + <entry> + <key>Discount in %</key> + </entry> <entry> <key>You were assigned as new district contact to district %0 and %1 organisation(s).</key> </entry> @@ -11330,9 +11333,6 @@ <entry> <key>Existing customer</key> </entry> - <entry> - <key>Discount in %</key> - </entry> <entry> <key>Cust.-No.</key> </entry> @@ -11348,6 +11348,54 @@ <entry> <key>manually</key> </entry> + <entry> + <key>Contact or company</key> + </entry> + <entry> + <key>File can't be edited here. You can download, edit and reupload the template to change the content.</key> + </entry> + <entry> + <key>Cost overview</key> + </entry> + <entry> + <key>Stufen</key> + </entry> + <entry> + <key>Adito red</key> + </entry> + <entry> + <key>general</key> + </entry> + <entry> + <key>Adito grey</key> + </entry> + <entry> + <key>Ad hoc</key> + </entry> + <entry> + <key>White</key> + </entry> + <entry> + <key>news@adito.de</key> + </entry> + <entry> + <key>Feedback</key> + </entry> + <entry> + <key>Adito light blue</key> + </entry> + <entry> + <key>Retour</key> + </entry> + <entry> + <key>Adito dark blue</key> + </entry> + <entry> + <key>To re-open tickets, please use the corresponding action.</key> + </entry> + <entry> + <key>The status-change of the ticket was skipped. Any other changes were carried out.</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 a54d9d96636a6a14862a5044eb386e36f6123709..736ce74e9c690c02d0223e3fa6168aff4e775cff 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -58,7 +58,7 @@ <value>Sie müssen mindestens einen Empfänger eintragen.</value> </entry> <entry> - <key>To re-opening tickets, please use the corresponding action.</key> + <key>To re-open tickets, please use the corresponding action.</key> <value>Nutzen Sie bitte die entsprechende Aktion, um Tickets wiederzueröffnen.</value> </entry> <entry> @@ -83,7 +83,7 @@ </entry> <entry> <key>You tried to change the status of \"%0\" tickets from 'ended' to another status.</key> - <value>Sie haben versucht den Status von \"%0\" Tickets von 'abgeschlossen zu einem anderen Status zu ändern.</value> + <value>Sie haben versucht den Status von \"%0\" Tickets von 'abgeschlossen' zu einem anderen Status zu ändern.</value> </entry> <entry> <key>Ticket was duplicated by</key> @@ -2806,7 +2806,7 @@ </entry> <entry> <key>Unique click rate (in \%)</key> - <value>Unique Klickrate in Prozent</value> + <value>Einzigartige Klickrate in Prozent</value> </entry> <entry> <key>Contact Owner</key> @@ -3479,6 +3479,10 @@ <key>Public Hand</key> <value>Öffentliche Hand</value> </entry> + <entry> + <key>Cost overview</key> + <value>Kostenübersicht</value> + </entry> <entry> <key>Create and open in editor</key> <value>Erstellen und im Editor öffnen</value> @@ -6043,6 +6047,10 @@ <key>Tag</key> <value>Tag</value> </entry> + <entry> + <key>general</key> + <value>Allgemein</value> + </entry> <entry> <key>Title suffix</key> <value>Namenszusatz</value> @@ -13439,6 +13447,10 @@ Bitte Datumseingabe prüfen</value> <key>determined in</key> <value>ermittelt in</value> </entry> + <entry> + <key>The status-change of the ticket was skipped. Any other changes were carried out.</key> + <value>Die Statusänderungen dieses Tickets wurde übersprungen. Alle anderen Änderungen wurden durchgeführt.</value> + </entry> <entry> <key>duplicate Ticket</key> <value>Duplizieren</value> @@ -14548,6 +14560,7 @@ Bitte Datumseingabe prüfen</value> </entry> <entry> <key>Unique click rate (in %)</key> + <value>Einzigartige Klickrate in Prozent</value> </entry> <entry> <key>Employees for Employee groups</key> @@ -14563,6 +14576,7 @@ Bitte Datumseingabe prüfen</value> </entry> <entry> <key>Opener rate (in %)</key> + <value>Öffnungsrate in Prozent</value> </entry> <entry> <key>Evaluation type</key> @@ -14594,6 +14608,7 @@ Bitte Datumseingabe prüfen</value> </entry> <entry> <key>Click rate (in %)</key> + <value>Klickrate in Prozent</value> </entry> <entry> <key>Ticket return</key> @@ -14646,6 +14661,7 @@ Bitte Datumseingabe prüfen</value> </entry> <entry> <key>New Service ticket</key> + <value>Neues Serviceticket</value> </entry> <entry> <key>Use all service ticket categories</key> @@ -14808,14 +14824,51 @@ Bitte Datumseingabe prüfen</value> <key>Further informations</key> </entry> <entry> - <key>${TASK_PROTECTIONLEVEL}</key> - <value>Private Aufgabe</value> + <key>EML files can't be edited here. You can download, edit and reupload the template to change the content.</key> </entry> <entry> - <key>Manually</key> + <key>Kd.-Nr.</key> </entry> <entry> - <key>Consisted customer</key> + <key>Stufen</key> + </entry> + <entry> + <key>Adito red</key> + <value>Adito rot</value> + </entry> + <entry> + <key>general</key> + <value>allgemein</value> + </entry> + <entry> + <key>Adito grey</key> + <value>Adito grau</value> + </entry> + <entry> + <key>Ad hoc</key> + </entry> + <entry> + <key>White</key> + <value>Weiß</value> + </entry> + <entry> + <key>news@adito.de</key> + </entry> + <entry> + <key>Feedback</key> + <value>Rückmeldung</value> + </entry> + <entry> + <key>Adito light blue</key> + <value>Adito hellblau</value> + </entry> + <entry> + <key>Retour</key> + <value>Rücksendung</value> + </entry> + <entry> + <key>Adito dark blue</key> + <value>Adito dunkelblau</value> </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 8b44024a18c1c43612c5a7850e1efa91951a6abf..db163fbc236e4c1455d51c49978ea303f3b70cbe 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -11322,6 +11322,9 @@ <entry> <key>Discount in %0</key> </entry> + <entry> + <key>Discount in %</key> + </entry> <entry> <key>You were assigned as new district contact to district %0 and %1 organisation(s).</key> </entry> @@ -11427,9 +11430,6 @@ <entry> <key>Existing customer</key> </entry> - <entry> - <key>Discount in %</key> - </entry> <entry> <key>Cust.-No.</key> </entry> @@ -11446,6 +11446,54 @@ <entry> <key>manually</key> </entry> + <entry> + <key>Contact or company</key> + </entry> + <entry> + <key>File can't be edited here. You can download, edit and reupload the template to change the content.</key> + </entry> + <entry> + <key>Cost overview</key> + </entry> + <entry> + <key>Stufen</key> + </entry> + <entry> + <key>Adito red</key> + </entry> + <entry> + <key>general</key> + </entry> + <entry> + <key>Adito grey</key> + </entry> + <entry> + <key>Ad hoc</key> + </entry> + <entry> + <key>White</key> + </entry> + <entry> + <key>news@adito.de</key> + </entry> + <entry> + <key>Feedback</key> + </entry> + <entry> + <key>Adito light blue</key> + </entry> + <entry> + <key>Retour</key> + </entry> + <entry> + <key>Adito dark blue</key> + </entry> + <entry> + <key>To re-open tickets, please use the corresponding action.</key> + </entry> + <entry> + <key>The status-change of the ticket was skipped. Any other changes were carried out.</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonContext/UserDailyGoals/UserDailyGoals.aod b/neonContext/UserDailyGoals/UserDailyGoals.aod deleted file mode 100644 index 80a3f8b913cb4c9a0d876119960d088bccdab0b3..0000000000000000000000000000000000000000 --- a/neonContext/UserDailyGoals/UserDailyGoals.aod +++ /dev/null @@ -1,7 +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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1"> - <name>UserDailyGoals</name> - <title>Ticket daily goals</title> - <description><null value></description> - <majorModelMode>DISTRIBUTED</majorModelMode> -</neonContext> diff --git a/neonContext/WeblinkClick/WeblinkClick.aod b/neonContext/WeblinkClick/WeblinkClick.aod index 06f55183587ce936ca90e2d452ecaf69070be639..a371f4c0fbd3d58ebe9e4beea7757f34a115725c 100644 --- a/neonContext/WeblinkClick/WeblinkClick.aod +++ b/neonContext/WeblinkClick/WeblinkClick.aod @@ -2,7 +2,6 @@ <neonContext 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/neonContext/1.1.1"> <name>WeblinkClick</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <filterView>WeblinkClickFilter_view</filterView> <entity>WeblinkClick_entity</entity> <references> <neonViewReference> diff --git a/neonView/BulkMailMain_view/BulkMailMain_view.aod b/neonView/BulkMailMain_view/BulkMailMain_view.aod index f61ce7711775bb207d6550a34a03ae62b373f096..9c304416151c5c105193aef06b1545744836e178 100644 --- a/neonView/BulkMailMain_view/BulkMailMain_view.aod +++ b/neonView/BulkMailMain_view/BulkMailMain_view.aod @@ -29,11 +29,6 @@ <entityField>BulkMailTestRecipients</entityField> <view>BulkMailTestRecipientFilter_view</view> </neonViewReference> - <neonViewReference> - <name>9e1e1137-f0a8-45d5-8b91-6e36411be6f1</name> - <entityField>Activities</entityField> - <view>ActivityFilter_view</view> - </neonViewReference> <neonViewReference> <name>cd8c44c9-209b-464c-a2e0-ce15720ab22e</name> <entityField>MailLogs</entityField> @@ -44,6 +39,11 @@ <entityField>Clicks</entityField> <view>WeblinkClickFilter_view</view> </neonViewReference> + <neonViewReference> + <name>9e1e1137-f0a8-45d5-8b91-6e36411be6f1</name> + <entityField>Activities</entityField> + <view>ActivityFilter_view</view> + </neonViewReference> <neonViewReference> <name>49eb2dd2-0df9-4b58-bdae-f941200be8d9</name> <entityField>LogHistories</entityField> diff --git a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod index b1b48e8a6a46f1d87accd01025ec8c81aa27eb6b..bd65911bca3075419355f7988ba99644f1b2abaa 100644 --- a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod +++ b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod @@ -23,9 +23,11 @@ </neonDashletConfiguration> </dashletConfigurations> <layout> - <boxLayout> + <drawerLayout> <name>layout</name> - </boxLayout> + <layoutCaption>Cost overview</layoutCaption> + <fixedDrawer v="true" /> + </drawerLayout> </layout> <children> <singleDataChartViewTemplate> diff --git a/neonView/CampaignOverview_view/CampaignOverview_view.aod b/neonView/CampaignOverview_view/CampaignOverview_view.aod index 8d48635c048e2ba5b327d5004610dc1ce02071ac..0e5711ecc2975192a5c3e4aa5666ec311f8179ae 100644 --- a/neonView/CampaignOverview_view/CampaignOverview_view.aod +++ b/neonView/CampaignOverview_view/CampaignOverview_view.aod @@ -7,7 +7,6 @@ <layout> <boxLayout> <name>layout</name> - <direction>VERTICAL</direction> </boxLayout> </layout> <children> diff --git a/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod b/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod index 10f2275e319aaa7c582324be30523367a902ecee..1c601dc689a85710bb9a4a2b7aed117bcea5b512 100644 --- a/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod +++ b/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod @@ -3,9 +3,11 @@ <name>CampaignParticipantChart_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <drawerLayout> <name>layout</name> - </boxLayout> + <layoutCaption>Participants</layoutCaption> + <fixedDrawer v="true" /> + </drawerLayout> </layout> <children> <multiDataChartViewTemplate> diff --git a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod b/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod deleted file mode 100644 index e11db29e24c4128c55e21f6686762e87d85931a9..0000000000000000000000000000000000000000 --- a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod +++ /dev/null @@ -1,10 +0,0 @@ -<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8"> - <name>CampaignStepMembers_view</name> - <majorModelMode>DISTRIBUTED</majorModelMode> - <layout> - <noneLayout> - <name>layout</name> - </noneLayout> - </layout> -</neonView> diff --git a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod index fa93cc7f4c3a663c0b6efe7fc2185538b0a2d365..8318e45e12104638b95893faeb52066466e4b14d 100644 --- a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod +++ b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod @@ -3,9 +3,11 @@ <name>CampaignStepsGantt_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <noneLayout> + <drawerLayout> <name>layout</name> - </noneLayout> + <layoutCaption>Stufen</layoutCaption> + <fixedDrawer v="true" /> + </drawerLayout> </layout> <children> <ganttViewTemplate> diff --git a/neonView/DocumentTemplatePlaceOfUseList_view/DocumentTemplatePlaceOfUseList_view.aod b/neonView/DocumentTemplatePlaceOfUseList_view/DocumentTemplatePlaceOfUseList_view.aod deleted file mode 100644 index a794c79ae5468961a47b76e4ef551e5f22129790..0000000000000000000000000000000000000000 --- a/neonView/DocumentTemplatePlaceOfUseList_view/DocumentTemplatePlaceOfUseList_view.aod +++ /dev/null @@ -1,10 +0,0 @@ -<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8"> - <name>DocumentTemplatePlaceOfUseList_view</name> - <majorModelMode>DISTRIBUTED</majorModelMode> - <layout> - <noneLayout> - <name>layout</name> - </noneLayout> - </layout> -</neonView> diff --git a/neonView/DuplicatesOverview_view/DuplicatesOverview_view.aod b/neonView/DuplicatesOverview_view/DuplicatesOverview_view.aod deleted file mode 100644 index e7f6cadf9d25dabbe2ee05bb144c190b8ee90a8b..0000000000000000000000000000000000000000 --- a/neonView/DuplicatesOverview_view/DuplicatesOverview_view.aod +++ /dev/null @@ -1,20 +0,0 @@ -<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8"> - <name>DuplicatesOverview_view</name> - <majorModelMode>DISTRIBUTED</majorModelMode> - <layout> - <masterSlaveLayout> - <name>layout</name> - </masterSlaveLayout> - </layout> - <children> - <neonViewReference> - <name>b3164f16-fa7e-42b0-829f-88553add7c08</name> - <entityField>#ENTITY</entityField> - </neonViewReference> - <neonViewReference> - <name>8e19d057-58da-4db8-8119-ecf070af86ab</name> - <entityField>#ENTITY</entityField> - </neonViewReference> - </children> -</neonView> diff --git a/neonView/MSTTeamChannelEdit_view/MSTTeamChannelEdit_view.aod b/neonView/MSTTeamChannelEdit_view/MSTTeamChannelEdit_view.aod deleted file mode 100644 index 7bc6b98e1de9c6015fe82e48d2d4c5b1b4171f2e..0000000000000000000000000000000000000000 --- a/neonView/MSTTeamChannelEdit_view/MSTTeamChannelEdit_view.aod +++ /dev/null @@ -1,10 +0,0 @@ -<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8"> - <name>MSTTeamChannelEdit_view</name> - <majorModelMode>DISTRIBUTED</majorModelMode> - <layout> - <noneLayout> - <name>layout</name> - </noneLayout> - </layout> -</neonView> diff --git a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod index d1aa285fbcdfa37a727490e125eceb6fa90d0e49..baf020a9f84dfc6f70d945a8c97f341c35cbba28 100644 --- a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod +++ b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod @@ -80,7 +80,7 @@ </neonViewReference> <neonViewReference> <name>ad2e41fc-e1e3-4907-9d23-7f3e3c4a026b</name> - <entityField>Service tickets</entityField> + <entityField>ServiceTickets</entityField> <view>SupportTicketMultiEdit_view</view> </neonViewReference> </children> diff --git a/neonView/SalesprojectPhaseInfoTraitList_view/SalesprojectPhaseInfoTraitList_view.aod b/neonView/SalesprojectPhaseInfoTraitList_view/SalesprojectPhaseInfoTraitList_view.aod deleted file mode 100644 index 66589d53af1ec84be40e2d12d8226dc700d5edec..0000000000000000000000000000000000000000 --- a/neonView/SalesprojectPhaseInfoTraitList_view/SalesprojectPhaseInfoTraitList_view.aod +++ /dev/null @@ -1,10 +0,0 @@ -<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8"> - <name>SalesprojectPhaseInfoTraitList_view</name> - <majorModelMode>DISTRIBUTED</majorModelMode> - <layout> - <noneLayout> - <name>layout</name> - </noneLayout> - </layout> -</neonView> diff --git a/neonView/WeblinkMain_view/WeblinkMain_view.aod b/neonView/WeblinkMain_view/WeblinkMain_view.aod index d768584685d2a8d1d45a3c704c78100ae8174e1a..ba9e2d634fe194c11e2c52a5ed847d5dc1e47425 100644 --- a/neonView/WeblinkMain_view/WeblinkMain_view.aod +++ b/neonView/WeblinkMain_view/WeblinkMain_view.aod @@ -24,5 +24,10 @@ <entityField>Clicks</entityField> <view>WeblinkClickFilter_view</view> </neonViewReference> + <neonViewReference> + <name>ae528068-30ba-45b2-a052-a33cc9d76635</name> + <entityField>LogHistories</entityField> + <view>LogHistoryFilter_view</view> + </neonViewReference> </children> </neonView> diff --git a/process/Dependency_lib/process.js b/process/Dependency_lib/process.js index efe81c43ef8249475a569c9732b3fe96a3149a33..20e0d32b4cefaddf9386a32dbadc0dac70c206e1 100644 --- a/process/Dependency_lib/process.js +++ b/process/Dependency_lib/process.js @@ -1,6 +1,6 @@ +import("system.tag"); import("Util_lib"); import("Sql_lib"); -import("system.favorite"); function Dependency(){} @@ -112,8 +112,8 @@ Dependency.defaultFunctionForFavorites = function (pTableField, pContext) let rowIds = Dependency.defaultFunctionForField(pTableField)(pNewData, pOldData); let ids = []; - let config = favorite.createGetFavoritesConfig().setObjectType(pContext); - let favos = favorite.getFavorites(config); + let config = tag.createGetTaggedObjectsConfig().setObjectType(pContext); + let favos = tag.getTaggedObjects(config); for(let i = 0; i < favos.length; i++) { diff --git a/process/DocxTemplater_lib/process.js b/process/DocxTemplater_lib/process.js index 9fecd012b74882f6e972df34ea7fbc7156eb5b34..553140cb4f044f4e7919d6c598cd0e03a8aac784 100644 --- a/process/DocxTemplater_lib/process.js +++ b/process/DocxTemplater_lib/process.js @@ -10106,10 +10106,10 @@ function tagMatcher(content, textMatchArray, othersMatchArray) { var tagText = content.slice(offset, cursor + 1); var _getTag = getTag(tagText), - tag = _getTag.tag, + tagName = _getTag.tag, position = _getTag.position; - var text1 = allMatches[tag]; + var text1 = allMatches[tagName]; if (text1 == null) { continue; } @@ -10387,11 +10387,11 @@ function throwUnmatchedLoopException(options) { var T = location === "start" ? "Unclosed" : "Unopened"; var err = new Errors.XTTemplateError(T + " loop"); - var tag = options.part.value; + var tagName = options.part.value; err.properties = { id: t + "_loop", - explanation: "The loop with tag " + tag + " is " + t, - xtag: tag + explanation: "The loop with tag " + tagName + " is " + t, + xtag: tagName }; throw err; } @@ -10578,10 +10578,10 @@ var wrapper = require("../module-wrapper"); function throwRawTagShouldBeOnlyTextInParagraph(options) { var err = new Errors.XTTemplateError("Raw tag should be the only text in paragraph"); - var tag = options.part.value; + var tagName = options.part.value; err.properties = { id: "raw_xml_tag_should_be_only_text_in_paragraph", - explanation: "The tag " + tag, + explanation: "The tag " + tagName, xtag: options.part.value, paragraphParts: options.paragraphParts }; @@ -10979,12 +10979,12 @@ var Errors = require("./errors"); function throwRawTagNotInParagraph(options) { var err = new Errors.XTTemplateError("Raw tag not in paragraph"); - var tag = options.part.value; + var tagName = options.part.value; err.properties = { id: "raw_tag_outerxml_invalid", - explanation: "The tag \"" + tag + "\"", + explanation: "The tag \"" + tagName + "\"", rootError: options.rootError, - xtag: tag, + xtag: tagName, postparsed: options.postparsed, expandTo: options.expandTo, index: options.index @@ -11020,17 +11020,17 @@ function getListXmlElements(parts) { var res = []; - for (var i = 0, tag; i < tags.length; i++) { - tag = tags[i]; + for (var i = 0, tagName; i < tags.length; i++) { + tagName = tags[i]; // closing tag - if (tag[1] === "/") { - if (lastTagIsOpenTag(res, tag)) { + if (tagName[1] === "/") { + if (lastTagIsOpenTag(res, tagName)) { res.pop(); } else { - res = addTag(res, tag); + res = addTag(res, tagName); } - } else if (tag[tag.length - 1] !== "/") { - res = addTag(res, tag); + } else if (tagName[tagName.length - 1] !== "/") { + res = addTag(res, tagName); } } return res; diff --git a/process/EwsClientSync_lib/process.js b/process/EwsClientSync_lib/process.js index ff217c1c934f6c2a8ef85fe1770e52382fd48374..0fe43af79e9dd8228b13ad361e58bd97927c8590 100644 --- a/process/EwsClientSync_lib/process.js +++ b/process/EwsClientSync_lib/process.js @@ -1,3 +1,4 @@ +import("system.tag"); import("system.neonFilter"); import("system.neon"); import("Util_lib"); @@ -9,7 +10,6 @@ import("system.vars"); import("system.datetime"); import("system.util"); import("system.tools"); -import("system.favorite"); import("system.logging"); import("Sql_lib"); import("system.db"); @@ -276,12 +276,12 @@ EwsClientSyncUtils.removeFromFavorite = function(pToDelete, pUserId ){ //maybe in a future version there will be a way to remove favorites on a better way //all ews related Favorites for the user - var config = favorite.createGetFavoritesConfig() + var config = tag.createGetTaggedObjectsConfig() .setFavoriteGroupTitle(EwsClientSyncUtils.EWSSYNCTAG()) - .setGroupType(favorite.FAVORITE_GROUP).setObjectType("Person") + .setGroupType(tag.FAVORITE_GROUP).setObjectType("Person") .setUserId(pUserId); - var ewsFavorite = favorite.getFavorites(config); + var ewsFavorite = tag.getTaggedObjects(config); var favsToDelete = []; var dataIndex = { @@ -310,9 +310,9 @@ EwsClientSyncUtils.removeFromFavorite = function(pToDelete, pUserId ){ favsToDelete.push(row["id"]); } - var delConfig = favorite.createRemoveMultipleByIdConfig().setFavoriteRecordIds(favsToDelete); + var delConfig = tag.createUntagMultipleByIdConfig().setFavoriteRecordIds(favsToDelete); - return favorite.remove(delConfig); + return tag.untag(delConfig); } /* @@ -323,15 +323,15 @@ EwsClientSyncUtils.removeFromFavorite = function(pToDelete, pUserId ){ EwsClientSyncUtils.addToEwsFavorite = function(pToInsert){ var userID = tools.getCurrentUser()[tools.NAME] - var config = favorite.createAddFavoriteConfig(); + var config = tag.createAddTagConfig(); config.setFavoriteGroupTitle(EwsClientSyncUtils.EWSSYNCTAG()); config.setObjectType("Person"); config.setUserId(userID); - config.setGroupType(favorite.FAVORITE_GROUP) + config.setGroupType(tag.FAVORITE_GROUP) for(let i = 0, l = pToInsert.length; i < l; i++){ config.setRowId(pToInsert[i]); - favorite.add(config); + tag.add(config); } } diff --git a/process/Favorites_lib/process.js b/process/Favorites_lib/process.js index 151f9b73a6ceb930b44921b17decd4caa2e6b42d..c44f97e496a4f8bbe8469e31010e166017f472ad 100644 --- a/process/Favorites_lib/process.js +++ b/process/Favorites_lib/process.js @@ -1,6 +1,6 @@ +import("system.tag"); import("system.translate"); import("system.vars"); -import("system.favorite"); import("system.tools"); import("system.result"); import("Sql_lib"); @@ -10,7 +10,7 @@ function FavoritesUtil(){} FavoritesUtil.getUserFavoriteGroups = function() { var allTypes = []; - var alias = favorite.getFavoritesAlias(); + var alias = tag.getTagAlias(); var filterCond = newWhere("ASYS_RECORDGROUP.USER_ID", tools.getCurrentUser()["name"], null, null, alias); @@ -57,7 +57,7 @@ FavoritesUtil.getFilterDisplayCondition = function(pObjecttype, pOperator, pRawv */ FavoritesUtil.getRowIdsOfFavorites = function(pObjecttype, pOperator, pRawvalue) { - var sysAlias = favorite.getFavoritesAlias(); + var sysAlias = tag.getTagAlias(); var op = ""; if(pOperator == "1") @@ -85,7 +85,7 @@ FavoritesUtil.getRowIdsOfFavorites = function(pObjecttype, pOperator, pRawvalue) FavoritesUtil.getUserFavoriteGroupsByContext = function(pContext) { var allTypes = []; - var alias = favorite.getFavoritesAlias(); + var alias = tag.getTagAlias(); var filterCond = newWhere("ASYS_RECORDGROUP.USER_ID", tools.getCurrentUser()[tools.NAME], null, null, alias); diff --git a/process/Location_lib/process.js b/process/Location_lib/process.js index 98a3aba621804153d9911ff1d69466de95863e25..21069bc5eac24193cecdea6e8891e457d6db313d 100644 --- a/process/Location_lib/process.js +++ b/process/Location_lib/process.js @@ -295,8 +295,8 @@ LocationFinder.prototype.getGeoLocation = function (pAddress) * Update LAT, LON and VALIDATION of the given Addresses * This function is call-by-reference and the errors of the updates will be returned by pMalformedAddressData. * - * @param {pMalformedAddressData} to collect the errors of the updates - * @param {pAddresses} pAddress an object containing the address data + * @param {Array} pMalformedAddressData to collect the errors of the updates + * @param {Array} pAddresses an object containing the address data * * @return {void} */ diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js index 7d890d2866c7f074a10c13b8506608fec261502d..567c87350b049c3f212d5782cdb6aeb3bbe77f68 100644 --- a/process/OfferOrder_lib/process.js +++ b/process/OfferOrder_lib/process.js @@ -354,7 +354,8 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c //recursive function for building item insert statements function __itemInsertStatement(partsListObj, assignedTo, currency, contactId) { - for (var i = 0; i < partsListObj.ids.length; i++) { + for (var i = 0; i < partsListObj.ids.length; i++) + { var newid = util.getNewUUID(); self._appendNode(newid, assignedTo); var pos = self.ItemTree[newid].pos; @@ -383,7 +384,6 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c priceObject[newid]["vat"] = vat; priceObject[newid]["quantity"] = P2pObject["quantity"]; } - } else if(pSumUpPrices)//also build priceObject if pSumUpPrices is set to true { @@ -396,16 +396,19 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c treeStructure = ItemUtils.buildTreeStructure(treeStructure, assignedTo, newid); } - var vals = [newid - , self.offerOrderId - , prodid - , ProductDetails.groupCode - , assignedTo - , ProductDetails.productName - , ProductDetails.unit - , price - , vat == null || vat == undefined || vat == "" ? 0 : vat - , P2pObject.quantity]; + var vals = [ + newid, + self.offerOrderId, + prodid, + ProductDetails.groupCode, + assignedTo, + ProductDetails.productName, + ProductDetails.unit, + price, + vat == null || vat == undefined || vat == "" ? 0 : vat, + P2pObject.quantity, + "0" + ]; if(_optionalIsIncluded(columns) == true)//add optional if needed @@ -913,4 +916,4 @@ ItemUtils.getNode = function (pObject, pName, pCurrName){ return res; } return null; - } \ No newline at end of file + } diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js index 15c7e2f1a7843a5e40784d64a04249acff3a2cd8..4f4be22c23c572b7d6cdf2ef79027dab7cfa60a0 100644 --- a/process/Offer_lib/process.js +++ b/process/Offer_lib/process.js @@ -592,19 +592,22 @@ OfferItemUtils.prototype.roundPrice = function(pPrice) { OfferItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCurrency, pContactId, pLanguage, pQuantity, pSumUpPrices, pOfferId, pSumUpTopPrice) { this.initItemTree(); - var cols = ["OFFERITEMID" - , "OFFER_ID" - , "PRODUCT_ID" - , "GROUPCODEID" - , "ASSIGNEDTO" - , "ITEMNAME" - , "UNIT" - , "PRICE" - , "VAT" - , "QUANTITY" - , "OPTIONAL" - , "ITEMPOSITION" - , "ITEMSORT"]; + var cols = [ + "OFFERITEMID", + "OFFER_ID", + "PRODUCT_ID", + "GROUPCODEID", + "ASSIGNEDTO", + "ITEMNAME", + "UNIT", + "PRICE", + "VAT", + "QUANTITY", + "DISCOUNT", + "OPTIONAL", + "ITEMPOSITION", + "ITEMSORT" + ]; return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pContactId, [[["info", "INFO"], ["info", "( " + newSelect("DESCRIPTION") diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js index 802648b9ffade4f8e137f796eb5722f5b11e4381..3cfcb2dc8c4f8cc328d1897faad8ef8173eaa509 100644 --- a/process/Order_lib/process.js +++ b/process/Order_lib/process.js @@ -704,18 +704,21 @@ OrderItemUtils.prototype.roundPrice = function(pPrice) { OrderItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCurrency, pContactId, pQuantity, pSumUpPrices, pOrderId, pSumUpTopPrice) { this.initItemTree(); - var cols = ["SALESORDERITEMID" - , "SALESORDER_ID" - , "PRODUCT_ID" - , "GROUPCODEID" - , "ASSIGNEDTO" - , "ITEMNAME" - , "UNIT" - , "PRICE" - , "VAT" - , "QUANTITY" - , "ITEMPOSITION" - , "ITEMSORT"]; + var cols = [ + "SALESORDERITEMID", + "SALESORDER_ID", + "PRODUCT_ID", + "GROUPCODEID", + "ASSIGNEDTO", + "ITEMNAME", + "UNIT", + "PRICE", + "VAT", + "QUANTITY", + "DISCOUNT", + "ITEMPOSITION", + "ITEMSORT" + ]; return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pContactId, undefined, pQuantity, pSumUpPrices, "Order", pOrderId, pAssignedTo, pSumUpTopPrice, true]); } diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js index ecc8f1ed818c8617735dd702a025269dfcfd8fdf..c77721eaeca586680c883ebf2b320862ad7ad99a 100644 --- a/process/Sql_lib/process.js +++ b/process/Sql_lib/process.js @@ -3404,8 +3404,9 @@ SqlMaskingUtils.prototype.isNull = function (pField, pReplacement) case db.DBTYPE_DERBY10: case db.DBTYPE_MYSQL4: case db.DBTYPE_MARIADB10: - default: return "coalesce(" + pField + ", " + pReplacement + ")"; + default: + throw new Error(translate.withArguments("${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0", ["SqlMaskingUtils.prototype.isNull"])); } } diff --git a/process/getDocxDocument_serverProcess/process.js b/process/getDocxDocument_serverProcess/process.js index 5df148c50463a5b7c21768b73322598f374c45bd..d460263ecc026db9160ef16dc6031266724f90f0 100644 --- a/process/getDocxDocument_serverProcess/process.js +++ b/process/getDocxDocument_serverProcess/process.js @@ -10089,10 +10089,10 @@ function getTag(tag) { function tagMatcher(content, textMatchArray, othersMatchArray) { var cursor = 0; var contentLength = content.length; - var allMatches = DocUtils.concatArrays([textMatchArray.map(function (tag) { - return { tag: tag, text: true }; - }), othersMatchArray.map(function (tag) { - return { tag: tag, text: false }; + var allMatches = DocUtils.concatArrays([textMatchArray.map(function (pTag) { + return { tag: pTag, text: true }; + }), othersMatchArray.map(function (pTag) { + return { tag: pTag, text: false }; })]).reduce(function (allMatches, t) { allMatches[t.tag] = t.text; return allMatches; @@ -10109,10 +10109,10 @@ function tagMatcher(content, textMatchArray, othersMatchArray) { var tagText = content.slice(offset, cursor + 1); var _getTag = getTag(tagText), - tag = _getTag.tag, + tagName = _getTag.tag, position = _getTag.position; - var text1 = allMatches[tag]; + var text1 = allMatches[tagName]; if (text1 == null) { continue; } @@ -10390,11 +10390,11 @@ function throwUnmatchedLoopException(options) { var T = location === "start" ? "Unclosed" : "Unopened"; var err = new Errors.XTTemplateError(T + " loop"); - var tag = options.part.value; + var tagName = options.part.value; err.properties = { id: t + "_loop", - explanation: "The loop with tag " + tag + " is " + t, - xtag: tag + explanation: "The loop with tag " + tagName + " is " + t, + xtag: tagName }; throw err; } @@ -10581,10 +10581,10 @@ var wrapper = require("../module-wrapper"); function throwRawTagShouldBeOnlyTextInParagraph(options) { var err = new Errors.XTTemplateError("Raw tag should be the only text in paragraph"); - var tag = options.part.value; + var tagName = options.part.value; err.properties = { id: "raw_xml_tag_should_be_only_text_in_paragraph", - explanation: "The tag " + tag, + explanation: "The tag " + tagName, xtag: options.part.value, paragraphParts: options.paragraphParts }; @@ -10982,12 +10982,12 @@ var Errors = require("./errors"); function throwRawTagNotInParagraph(options) { var err = new Errors.XTTemplateError("Raw tag not in paragraph"); - var tag = options.part.value; + var tagName = options.part.value; err.properties = { id: "raw_tag_outerxml_invalid", - explanation: "The tag \"" + tag + "\"", + explanation: "The tag \"" + tagName + "\"", rootError: options.rootError, - xtag: tag, + xtag: tagName, postparsed: options.postparsed, expandTo: options.expandTo, index: options.index @@ -11023,17 +11023,17 @@ function getListXmlElements(parts) { var res = []; - for (var i = 0, tag; i < tags.length; i++) { - tag = tags[i]; + for (var i = 0, tagName; i < tags.length; i++) { + tagName = tags[i]; // closing tag - if (tag[1] === "/") { - if (lastTagIsOpenTag(res, tag)) { + if (tagName[1] === "/") { + if (lastTagIsOpenTag(res, tagName)) { res.pop(); } else { - res = addTag(res, tag); + res = addTag(res, tagName); } - } else if (tag[tag.length - 1] !== "/") { - res = addTag(res, tag); + } else if (tagName[tagName.length - 1] !== "/") { + res = addTag(res, tagName); } } return res;