diff --git a/.liquibase/Data_alias/basic/2021.2.2/alter_display-name_prospective-customer.xml b/.liquibase/Data_alias/basic/2021.2.2/alter_display-name_prospective-customer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c7451fe72e3df6a6ad0dd1b235dc67662d9feac2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_display-name_prospective-customer.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="d.tran" id="5e9314bc-291b-4396-a155-e1a06afcbb1c">
+ <update tableName="AB_ATTRIBUTE">
+ <column name="ATTRIBUTE_NAME" value="Existing customer" />
+ <where>AB_ATTRIBUTEID = 'be3b5fe2-2146-4eab-80a4-3c1cf4d6156a'</where>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml b/.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a823261ccfd831ccb5b8d91b64ede62555de77a0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="d.tran" id="8f556a75-720c-45b6-9cfe-c26308f96a65">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="completed" />
+ <where>AB_KEYWORD_ENTRYID = '7311d8c5-edf2-492e-be4d-6f0469334611'</where>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml b/.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml
new file mode 100644
index 0000000000000000000000000000000000000000..34559711345a7dc050d25e33b4f3ea18f1d6e52d
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="d.tran" id="f420d656-da64-4ac2-aa10-8ce529479240">
+ <update tableName="AB_OBJECTRELATIONTYPE">
+ <column name="RELATION_TITLE" value="grandchild of" />
+ <where>AB_OBJECTRELATIONTYPEID = 'a2296f93-2371-4ab8-9f29-ef0795d1e9b2'</where>
+ </update>
+ </changeSet>
+</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 46ab1893b464dfacbccd36697070e626f02e4562..c403e8c28cfcd962e78fec41c209a9574f4ee02e 100644
--- a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
@@ -1,6 +1,10 @@
<?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">
+ 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="alter_relation-type-title_grandchildof.xml"/>
+ <include relativeToChangelogFile="true" file="alter_display-value_task-status-completed_keyword.xml"/>
+ <include relativeToChangelogFile="true" file="alter_display-name_prospective-customer.xml"/>
<include relativeToChangelogFile="true" file="Offer/changelog.xml"/>
<include relativeToChangelogFile="true" file="lead_nurturing/changelog.xml"/>
<include relativeToChangelogFile="true" file="add_offer_showprice.xml"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
index 0998fd9809252b07a75d271b94e44c0b479ebdcd..231a2e8745fe1a30b280ea4c203103ed13e58fca 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
@@ -90,7 +90,7 @@
<column name="HIERARCHY" valueNumeric="0"/>
<column name="ICON" value="VAADIN:FAMILY"/>
<column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
- <column name="RELATION_TITLE" value="Grandchild of"/>
+ <column name="RELATION_TITLE" value="grandchild of"/>
</insert>
<insert tableName="ab_objectrelationtype">
<column name="SIDE" valueNumeric="2"/>
diff --git a/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js b/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js
index 3649d90dc86045fca17c5a8d484118829f83119e..5cd5a05861692bafe1781c2751a6741148c8cdf4 100644
--- a/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js
@@ -1,4 +1,5 @@
import("system.vars");
import("system.result");
+import("system.translate");
-result.string("Kdnr: " + vars.getString("$field.CUSTOMERCODE"));
\ No newline at end of file
+result.string(translate.text("Cust.-No.") + ": " + vars.getString("$field.CUSTOMERCODE"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js b/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js
index 5ba71cce2110bd392449f73860814559c1df7017..aadd79eaa5afa639bf65d9acf9db4c2f166a41fc 100644
--- a/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js
+++ b/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("Entity_lib");
diff --git a/entity/SearchSync_entity/SearchSync_entity.aod b/entity/SearchSync_entity/SearchSync_entity.aod
index e4b7a24f5b327d133960dffec1ec90b33ab10cc3..6088ee4c7fde2cb171bcfac6662d86af0a3173ed 100644
--- a/entity/SearchSync_entity/SearchSync_entity.aod
+++ b/entity/SearchSync_entity/SearchSync_entity.aod
@@ -4,7 +4,7 @@
<title>Contact synchronisation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<grantDelete v="false" />
- <iconId>VAADIN:SEARCH</iconId>
+ <iconId>NEON:RECURRING_APPOINTMENT</iconId>
<titlePlural>Contact synchronisations</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index fb2bcfa6a1a92340cc0d555dc703e8ae6c196b10..cb92ec4bb7b7e6141bae5ac50f09fe47da6f28b2 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -28,7 +28,7 @@
</entityProvider>
<entityField>
<name>SUBJECT</name>
- <title>subject</title>
+ <title>Subject</title>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/subject/valueProcess.js</valueProcess>
</entityField>
@@ -83,12 +83,13 @@
</entityField>
<entityField>
<name>DESCRIPTION</name>
- <title>description</title>
+ <title>Description</title>
<contentType>HTML</contentType>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/description/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PROTECTIONLEVEL</name>
+ <title>${TASK_PROTECTIONLEVEL}</title>
<contentType>BOOLEAN</contentType>
<contentTypeProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/contentTypeProcess.js</contentTypeProcess>
<titleProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/titleProcess.js</titleProcess>
@@ -357,7 +358,7 @@
</entityField>
<entityActionField>
<name>newSupportticket</name>
- <title>New Service ticket</title>
+ <title>New service ticket</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CHAT</iconId>
</entityActionField>
@@ -537,7 +538,7 @@
<children>
<entityActionField>
<name>setComplete</name>
- <title>Erledigt setzen</title>
+ <title>Set completed</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/filteractiongroup/children/setcomplete/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<selectionType>MULTI</selectionType>
@@ -581,7 +582,7 @@
</entityActionField>
<entityActionField>
<name>setCompletePreview</name>
- <title>Erledigt setzen</title>
+ <title>Set completed</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/setcompletepreview/onActionProcess.js</onActionProcess>
<iconId>NEON:MQL</iconId>
<state>DISABLED</state>
@@ -591,7 +592,7 @@
<name>newOffer</name>
<title>New offer</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CHART</iconId>
+ <iconId>VAADIN:CART</iconId>
</entityActionField>
<entityActionField>
<name>openAdminView</name>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 4e87cab5521159f8d30bd35d7d34a3eb956fb22f..cec103c6c74f7af2597181925947c695b6eb40e9 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -11321,6 +11321,33 @@
<entry>
<key>Show the finished Tickets in the last 4 weeks</key>
</entry>
+ <entry>
+ <key>Kd.-Nr.</key>
+ </entry>
+ <entry>
+ <key>completed</key>
+ </entry>
+ <entry>
+ <key>Existing customer</key>
+ </entry>
+ <entry>
+ <key>Discount in %</key>
+ </entry>
+ <entry>
+ <key>Cust.-No.</key>
+ </entry>
+ <entry>
+ <key>by title</key>
+ </entry>
+ <entry>
+ <key>by translated title</key>
+ </entry>
+ <entry>
+ <key>${TASK_PROTECTIONLEVEL}</key>
+ </entry>
+ <entry>
+ <key>manually</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 66f7124eb4078a2142beea4a3724ce596e61b663..97eacea5b556d9b5d3b83156512092194204ea69 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -2050,7 +2050,7 @@
</entry>
<entry>
<key>Region</key>
- <value>Gebiet</value>
+ <value>Region</value>
</entry>
<entry>
<key>Lastname</key>
@@ -3232,10 +3232,6 @@
<key>Task</key>
<value>Aufgabe</value>
</entry>
- <entry>
- <key>subject</key>
- <value>Betreff</value>
- </entry>
<entry>
<key>Mobile</key>
<value>Handy</value>
@@ -3248,10 +3244,6 @@
<key>{$TASK_REQUESTOR}</key>
<value>Anforderer</value>
</entry>
- <entry>
- <key>description</key>
- <value>Beschreibung</value>
- </entry>
<entry>
<key>priority</key>
<value>Priorität</value>
@@ -4720,7 +4712,7 @@
<value>Tochtergesellschaft von</value>
</entry>
<entry>
- <key>ended</key>
+ <key>completed</key>
<value>abgeschlossen</value>
</entry>
<entry>
@@ -7139,7 +7131,7 @@
<value>Geburtstagsliste</value>
</entry>
<entry>
- <key>Consisted customer</key>
+ <key>Existing customer</key>
<value>Bestandskunde</value>
</entry>
<entry>
@@ -12860,9 +12852,11 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Approval</key>
+ <value>Genehmigung</value>
</entry>
<entry>
<key>No activity</key>
+ <value>Keine Aktivität</value>
</entry>
<entry>
<key>Values have been updated, using the current rate:</key>
@@ -13362,6 +13356,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Einzelaufgaben erstellen</key>
+ <value>Create single tasks</value>
</entry>
<entry>
<key>Erledigt setzen</key>
@@ -13918,10 +13913,6 @@ Bitte Datumseingabe prüfen</value>
<key>Daily goals</key>
<value>Tagesziele</value>
</entry>
- <entry>
- <key>Further informations</key>
- <value>Weitere Informationen</value>
- </entry>
<entry>
<key>Conclusion</key>
<value>Abschluss</value>
@@ -14787,6 +14778,45 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Show the finished Tickets in the last 4 weeks</key>
</entry>
+ <entry>
+ <key>Cust.-No.</key>
+ <value>Kd.-Nr.</value>
+ </entry>
+ <entry>
+ <key>subject</key>
+ <value>Betreff</value>
+ </entry>
+ <entry>
+ <key>ended</key>
+ <value>beendet</value>
+ </entry>
+ <entry>
+ <key>description</key>
+ <value>Beschreibung</value>
+ </entry>
+ <entry>
+ <key>${TASK_PROTECTIONLEVEL}</key>
+ <value>Private Aufgabe</value>
+ </entry>
+ <entry>
+ <key>Manually</key>
+ </entry>
+ <entry>
+ <key>Consisted customer</key>
+ </entry>
+ <entry>
+ <key>Further informations</key>
+ </entry>
+ <entry>
+ <key>${TASK_PROTECTIONLEVEL}</key>
+ <value>Private Aufgabe</value>
+ </entry>
+ <entry>
+ <key>Manually</key>
+ </entry>
+ <entry>
+ <key>Consisted customer</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index ed4fa7e42b2b14e358f8be6bb1c874f241f722ee..8b44024a18c1c43612c5a7850e1efa91951a6abf 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -882,9 +882,6 @@
<entry>
<key>Task</key>
</entry>
- <entry>
- <key>subject</key>
- </entry>
<entry>
<key>{$TASK_REQUESTOR}</key>
<value>Requestor</value>
@@ -893,9 +890,6 @@
<key>{$TASK_EDITOR}</key>
<value>Editor</value>
</entry>
- <entry>
- <key>description</key>
- </entry>
<entry>
<key>priority</key>
</entry>
@@ -1830,7 +1824,7 @@
<key>Swaziland</key>
</entry>
<entry>
- <key>ended</key>
+ <key>completed</key>
</entry>
<entry>
<key>Wallis and Futuna</key>
@@ -11418,6 +11412,40 @@
<entry>
<key>Show the finished Tickets in the last 4 weeks</key>
</entry>
+ <entry>
+ <key>Kd.-Nr.</key>
+ </entry>
+ <entry>
+ <key>subject</key>
+ </entry>
+ <entry>
+ <key>ended</key>
+ </entry>
+ <entry>
+ <key>description</key>
+ </entry>
+ <entry>
+ <key>Existing customer</key>
+ </entry>
+ <entry>
+ <key>Discount in %</key>
+ </entry>
+ <entry>
+ <key>Cust.-No.</key>
+ </entry>
+ <entry>
+ <key>by title</key>
+ </entry>
+ <entry>
+ <key>by translated title</key>
+ </entry>
+ <entry>
+ <key>${TASK_PROTECTIONLEVEL}</key>
+ <value>Private task</value>
+ </entry>
+ <entry>
+ <key>manually</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index b2d178249281f7e171499d047499dea540086297..5228efc0ee3d54f2cdb3758dc78d2d2658679778 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -34,15 +34,15 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>8b6d9b7d-588e-481b-84ac-a3f918b266dc</name>
- <entityField>LogHistories</entityField>
- <view>LogHistoryFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>82705fc4-32ea-42de-ae34-df00dbd4b159</name>
<entityField>#ENTITY</entityField>
<view>ActivityAdvertising_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>8b6d9b7d-588e-481b-84ac-a3f918b266dc</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/LeadimportMain_view/LeadimportMain_view.aod b/neonView/LeadimportMain_view/LeadimportMain_view.aod
index 21dca8795337ccaec37844efc65f29311ff46e40..d96bffac876fb78ab510b12be65b5a3de421a392 100644
--- a/neonView/LeadimportMain_view/LeadimportMain_view.aod
+++ b/neonView/LeadimportMain_view/LeadimportMain_view.aod
@@ -35,9 +35,9 @@
<view>LeadimportLeadFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>b085a160-f739-487c-a24c-5d12898aa6f1</name>
- <entityField>#ENTITY</entityField>
- <view>LeadimportLog_view</view>
+ <name>2d0068c7-b3df-4d01-bd0a-e9103851153b</name>
+ <entityField>Tasks</entityField>
+ <view>TaskFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>61237df6-2af1-41bd-bb56-da0bc624afb5</name>
@@ -45,9 +45,9 @@
<view>AttributeRelationTree_view</view>
</neonViewReference>
<neonViewReference>
- <name>2d0068c7-b3df-4d01-bd0a-e9103851153b</name>
- <entityField>Tasks</entityField>
- <view>TaskFilter_view</view>
+ <name>b085a160-f739-487c-a24c-5d12898aa6f1</name>
+ <entityField>#ENTITY</entityField>
+ <view>LeadimportLog_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index cf69a9efcb4d10099de9c270693da8cfc684a012..5b53c0a8cbed7e8dc605ee1bbe780d3b2853740d 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -15,6 +15,11 @@
<entityField>#ENTITY</entityField>
<view>OrganisationPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>c10533a6-d185-4b13-84ee-53a468544c03</name>
+ <entityField>Contact</entityField>
+ <view>PersonSimpleList_view</view>
+ </neonViewReference>
<neonViewReference>
<name>14bb5a70-fec1-4346-a8c2-2dde6fb32822</name>
<entityField>Activities</entityField>
@@ -26,25 +31,15 @@
<view>360DegreeFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>d63b5190-e85e-4a34-a937-3be8a3bd5d40</name>
- <entityField>ChecklistEntryValues</entityField>
- <view>ChecklistEntryValueList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c10533a6-d185-4b13-84ee-53a468544c03</name>
- <entityField>Contact</entityField>
- <view>PersonSimpleList_view</view>
+ <name>b6e7ad76-511f-46c4-b47c-b2e56825331b</name>
+ <entityField>#ENTITY</entityField>
+ <view>OrganisationPlanningTurnoverChart_view</view>
</neonViewReference>
<neonViewReference>
<name>0728e9d5-3b38-4b53-9f13-ebf3f4a9518e</name>
<entityField>#ENTITY</entityField>
<view>OrganisationConditionPricelist_view</view>
</neonViewReference>
- <neonViewReference>
- <name>c82aff98-ede5-4d9e-a902-89f71ed7dbb0</name>
- <entityField>ObjectTrees</entityField>
- <view>ObjectTreeFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>45c0f486-e7df-48ac-a201-661ac07f5fed</name>
<entityField>#ENTITY</entityField>
@@ -55,25 +50,30 @@
<entityField>#ENTITY</entityField>
<view>OrganisationAttribute_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c82aff98-ede5-4d9e-a902-89f71ed7dbb0</name>
+ <entityField>ObjectTrees</entityField>
+ <view>ObjectTreeFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>c2b37e4d-3b5e-4e23-8b7c-6da02b27ffc0</name>
<entityField>DistrictContacts</entityField>
<view>DistrictContactFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
- <entityField>Documents</entityField>
- <view>DocumentFilter_view</view>
+ <name>d63b5190-e85e-4a34-a937-3be8a3bd5d40</name>
+ <entityField>ChecklistEntryValues</entityField>
+ <view>ChecklistEntryValueList_view</view>
</neonViewReference>
<neonViewReference>
- <name>b6e7ad76-511f-46c4-b47c-b2e56825331b</name>
+ <name>56eb7d7d-23e9-4ab8-8a77-d0a6d997d710</name>
<entityField>#ENTITY</entityField>
- <view>OrganisationPlanningTurnoverChart_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
- <entityField>LogHistories</entityField>
- <view>LogHistoryFilter_view</view>
+ <view>OrganisationMarketing_view</view>
</neonViewReference>
<neonViewReference>
<name>a5ab96e5-927c-4db3-b7ed-f0c0aadcb89b</name>
@@ -81,9 +81,9 @@
<view>DuplicateFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>56eb7d7d-23e9-4ab8-8a77-d0a6d997d710</name>
- <entityField>#ENTITY</entityField>
- <view>OrganisationMarketing_view</view>
+ <name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 3e1bacb2f1d941942501b7badb112fae0e9dc4a8..30babbda6f73f09d220c11849c0d83d71ed90960 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -24,11 +24,6 @@
<entityField>360DegreeObjects</entityField>
<view>360DegreeFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>cb8ff3df-772b-4c12-8814-f9101295b1ba</name>
- <entityField>ObjectTrees</entityField>
- <view>ObjectTreeFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>c2606a8b-eac1-412e-893d-bb788d4a5b5c</name>
<entityField>OtherContacts</entityField>
@@ -49,6 +44,11 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>cb8ff3df-772b-4c12-8814-f9101295b1ba</name>
+ <entityField>ObjectTrees</entityField>
+ <view>ObjectTreeFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>82f19c55-fa96-43de-9f26-46069b28db31</name>
<entityField>#ENTITY</entityField>