diff --git a/neonContext/Competition/Competition.aod b/neonContext/Competition/Competition.aod
index 3466aa031c5faabae3d0ee4bced92c41b888019c..5426e2187996dc03b6997e1fda9f53d5e0a58d01 100644
--- a/neonContext/Competition/Competition.aod
+++ b/neonContext/Competition/Competition.aod
@@ -19,5 +19,9 @@
<name>6df65cb7-f8fc-4b6e-963d-df6dde6d523b</name>
<view>CompetitionPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>181ce712-9fd0-4044-9d44-6f12da0f0f54</name>
+ <view>CompetitionDrawer_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Forecast/Forecast.aod b/neonContext/Forecast/Forecast.aod
index f9867dedd369e05cd1c1ba94d8909bc9092537c5..016e7b97cb223c282df24c9fe596e3a1f56ed4a7 100644
--- a/neonContext/Forecast/Forecast.aod
+++ b/neonContext/Forecast/Forecast.aod
@@ -19,5 +19,9 @@
<name>1fe6e10b-52b4-44a4-88d8-9784a967572c</name>
<view>ForecastPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>4fb2da2d-ef4b-4b86-8d4b-9212591a8c47</name>
+ <view>ForecastDrawer_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Member/Member.aod b/neonContext/Member/Member.aod
index 8360ef841240df610e4e2e9ee334e8dfef5069e7..a1a393bf7426b4e49d8c29a16a30f59f48a72126 100644
--- a/neonContext/Member/Member.aod
+++ b/neonContext/Member/Member.aod
@@ -14,5 +14,9 @@
<name>ebef21a3-c0e1-4333-b769-eb967cb4099b</name>
<view>MemberEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>61eb4778-61aa-4419-8c8b-5ad69d86a4bb</name>
+ <view>MemberDrawer_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod b/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod
deleted file mode 100644
index faf54204f44215ee0e6263ee6769acd1a20fa5e0..0000000000000000000000000000000000000000
--- a/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>SalesprojectCompetition</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectCompetitionFilter_view</filterview>
- <editview>SalesprojectCompetitionEdit_view</editview>
- <preview>SalesprojectCompetitionPreview_view</preview>
- <entity>SalesprojectCompetition_entity</entity>
- <references>
- <neonViewReference>
- <name>a002c925-becb-4051-95bc-a38a4b01b65a</name>
- <view>SalesprojectCompetitionFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>df710f0b-ed2b-46d1-852d-47ada0b6b8f0</name>
- <view>SalesprojectCompetitionEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6df65cb7-f8fc-4b6e-963d-df6dde6d523b</name>
- <view>SalesprojectCompetitionPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>02f1b75e-3ee4-42e4-91c3-e03e4ef0dd52</name>
- <view>SalesprojectCompetitionDrawer_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonContext/SalesprojectForecast/SalesprojectForecast.aod b/neonContext/SalesprojectForecast/SalesprojectForecast.aod
deleted file mode 100644
index 211d61f7880d88b378873ac9e1d93265bcfa4f45..0000000000000000000000000000000000000000
--- a/neonContext/SalesprojectForecast/SalesprojectForecast.aod
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>SalesprojectForecast</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectForecastFilter_view</filterview>
- <editview>SalesprojectForecastEdit_view</editview>
- <preview>SalesprojectForecastPreview_view</preview>
- <entity>SalesprojectForecast_entity</entity>
- <references>
- <neonViewReference>
- <name>20d80c15-97f0-490c-b845-b2b4f63c6a5d</name>
- <view>SalesprojectForecastFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>7cc72509-722b-4d4f-870c-08878129ceb9</name>
- <view>SalesprojectForecastEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>1fe6e10b-52b4-44a4-88d8-9784a967572c</name>
- <view>SalesprojectForecastPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>590ecc5c-efc2-4f43-b4c9-ac824b28458b</name>
- <view>SalesprojectForcastDrawer_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonContext/SalesprojectMember/SalesprojectMember.aod b/neonContext/SalesprojectMember/SalesprojectMember.aod
deleted file mode 100644
index 07ace8db3941b74f067247d768b89beafa1816b4..0000000000000000000000000000000000000000
--- a/neonContext/SalesprojectMember/SalesprojectMember.aod
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>SalesprojectMember</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectMemberFilter_view</filterview>
- <editview>SalesprojectMemberEdit_view</editview>
- <entity>SalesprojectMember_entity</entity>
- <references>
- <neonViewReference>
- <name>6b0b9d8f-6fe8-475b-a303-f1c4f2011d37</name>
- <view>SalesprojectMemberFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ebef21a3-c0e1-4333-b769-eb967cb4099b</name>
- <view>SalesprojectMemberEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>fed6a0fe-2f26-4a55-b400-16ab52a66f5c</name>
- <view>SalesprojectMemberDrawer_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonContext/SalesprojectSource/SalesprojectSource.aod b/neonContext/SalesprojectSource/SalesprojectSource.aod
index fcf1b8606254980989e544e3859c14683bb22362..bfd11662b330436309099e077c316c28261f737e 100644
--- a/neonContext/SalesprojectSource/SalesprojectSource.aod
+++ b/neonContext/SalesprojectSource/SalesprojectSource.aod
@@ -20,7 +20,7 @@
<view>SalesprojectSourcePreview_view</view>
</neonViewReference>
<neonViewReference>
- <name>17ec805a-ea73-433a-a38c-2803e5aee82c</name>
+ <name>d7246373-a0a3-42e7-83c9-572eb7083cf8</name>
<view>SalesprojectSourceDrawer_view</view>
</neonViewReference>
</references>
diff --git a/neonView/SalesprojectCompetitionDrawer_view/SalesprojectCompetitionDrawer_view.aod b/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod
similarity index 76%
rename from neonView/SalesprojectCompetitionDrawer_view/SalesprojectCompetitionDrawer_view.aod
rename to neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod
index 4331bf197f59c0908ef0d697f4cc8b017125fe9e..c4e1ca3f84f61ae10f92174176bfe28c5405c99b 100644
--- a/neonView/SalesprojectCompetitionDrawer_view/SalesprojectCompetitionDrawer_view.aod
+++ b/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectCompetitionDrawer_view</name>
+ <name>CompetitionDrawer_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<drawerLayout>
@@ -10,9 +10,9 @@
</layout>
<children>
<neonViewReference>
- <name>499811e7-96f8-4382-b77e-0e83c3698929</name>
+ <name>539e86b4-19da-4e25-a2fd-ee41cda09273</name>
<entityField>#ENTITY</entityField>
- <view>SalesprojectCompetitionFilter_view</view>
+ <view>CompetitionFilter_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ForecastDrawer_view/ForecastDrawer_view.aod b/neonView/ForecastDrawer_view/ForecastDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c6b7af5d814bd26d1f64e0644e23b339f67d9a98
--- /dev/null
+++ b/neonView/ForecastDrawer_view/ForecastDrawer_view.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ForecastDrawer_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Forecast</layoutCaption>
+ </drawerLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>2d256ab5-1496-437a-abcb-20900cf3cc37</name>
+ <entityField>#ENTITY</entityField>
+ <view>ForecastFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMemberDrawer_view/SalesprojectMemberDrawer_view.aod b/neonView/MemberDrawer_view/MemberDrawer_view.aod
similarity index 74%
rename from neonView/SalesprojectMemberDrawer_view/SalesprojectMemberDrawer_view.aod
rename to neonView/MemberDrawer_view/MemberDrawer_view.aod
index 1dd81ab36de94246729a7524a17f4ad8b820a08b..9f540b690679e26cecec5e401337be0754b4da0e 100644
--- a/neonView/SalesprojectMemberDrawer_view/SalesprojectMemberDrawer_view.aod
+++ b/neonView/MemberDrawer_view/MemberDrawer_view.aod
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectMemberDrawer_view</name>
+ <name>MemberDrawer_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="false" />
<layout>
<drawerLayout>
<name>layout</name>
@@ -11,9 +10,9 @@
</layout>
<children>
<neonViewReference>
- <name>5d3baf7f-df1a-438b-a42e-d205def63fed</name>
+ <name>9210dae5-1587-43f2-875b-5136bf5976bf</name>
<entityField>#ENTITY</entityField>
- <view>SalesprojectMemberFilter_view</view>
+ <view>MemberFilter_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
deleted file mode 100644
index 976d30f829c4289cbc16807ce232778804211e13..0000000000000000000000000000000000000000
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ /dev/null
@@ -1,62 +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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectCompetitionPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>CONTACT_ID</titleField>
- <descriptionField></descriptionField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>b8f0210d-21fe-4ee8-9364-06f7369a0ef9</name>
- <entityField>PHASE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>33d74022-ccf9-47e7-8e24-6a1cedb1274e</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0519da18-4079-422a-9b65-9ab6dff01f1a</name>
- <entityField>DATE_CANCELLED</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>1c73d653-0734-4fc7-9965-5b4f35288e02</name>
- <entityField>REASON</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>a0ff837d-f2f8-4e14-8246-3acdd6653be0</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationPreviewList</view>
- </neonViewReference>
- <genericViewTemplate>
- <name>Description</name>
- <showDrawer v="true" />
- <drawerCaption>Description</drawerCaption>
- <hideLabels v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>ccc6faca-8eaa-4ffd-bf6a-2b2c63c16e7e</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod b/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
deleted file mode 100644
index 821a4c272d01aa615aedbc57e94b113e18eb7164..0000000000000000000000000000000000000000
--- a/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
+++ /dev/null
@@ -1,35 +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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectForecastFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Forecasts</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>323f26d7-4ac2-4ff9-91d1-7459cc7e3469</name>
- <entityField>GROUPCODE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c5422952-0a36-4963-a755-d513b4c8b23f</name>
- <entityField>DATE_START</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>24ecfbc3-5f8a-4ce1-b21b-663385845ff6</name>
- <entityField>VOLUME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>305d0254-a1ea-4733-87a7-a4d85fc78b7e</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod b/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
index a666ebfc2c3cf88e22a7a901f62f0aa024506f1d..fbe4c90ef72d87bd581912c5f65b4f7b0aef6532 100644
--- a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
+++ b/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
@@ -16,9 +16,9 @@
<view>ActivityDrawer_view</view>
</neonViewReference>
<neonViewReference>
- <name>ec72ee3c-deb1-4ed1-8b39-58e94ffe8543</name>
- <entityField>SalesprojectMembers</entityField>
- <view>SalesprojectMemberDrawer_view</view>
+ <name>ebf752f4-653d-4de3-9c81-c3e6ef692c48</name>
+ <entityField>Members</entityField>
+ <view>MemberDrawer_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod b/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod
index df0f9b593d17e9a4843a661a0c4da83a77d92959..af24daab68b399092e28a9f2eb2a119295bcea46 100644
--- a/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod
+++ b/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod
@@ -15,7 +15,7 @@
<view>SalesprojectMilestone_view</view>
</neonViewReference>
<neonViewReference>
- <name>0b034cf5-01df-4e5e-abc6-a4c2c2906605</name>
+ <name>7126a87f-4a78-462b-ac35-a3fb68afedcd</name>
<entityField>SalesprojectSources</entityField>
<view>SalesprojectSourceDrawer_view</view>
</neonViewReference>
diff --git a/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod b/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
index 3416e4be5bbcca445523fe98af56c643d562429a..1dd424987fa8f479dfb515eb3ab28ab6dc8e619a 100644
--- a/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
+++ b/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
@@ -10,14 +10,14 @@
</layout>
<children>
<neonViewReference>
- <name>91b38b40-e1ca-4fe7-94c0-84080a4c774e</name>
- <entityField>SalesprojectOffers</entityField>
- <view>OfferDrawer_view</view>
+ <name>c399a9ac-e0ad-490c-8ffb-247fc806233b</name>
+ <entityField>Forecasts</entityField>
+ <view>ForecastDrawer_view</view>
</neonViewReference>
<neonViewReference>
- <name>68d883e2-a773-411d-b2cf-0c2aa1f6824a</name>
- <entityField>SalesprojectForecasts</entityField>
- <view>SalesprojectForcastDrawer_view</view>
+ <name>74772673-7bf8-4e9c-8e61-d798c275c180</name>
+ <entityField>Offers</entityField>
+ <view>OfferDrawer_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectSourceDrawer_view/SalesprojectSourceDrawer_view.aod b/neonView/SalesprojectSourceDrawer_view/SalesprojectSourceDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..35f94f37719cbcba5ad3e05deb4e6b479e1447f1
--- /dev/null
+++ b/neonView/SalesprojectSourceDrawer_view/SalesprojectSourceDrawer_view.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SalesprojectSourceDrawer_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Touchpoints</layoutCaption>
+ </drawerLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>48334450-993a-4922-b314-271a98d85abe</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectSourceFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod b/neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod
index d6014a3e7fc61ba420c74e8a71dba7a61a9f2ea4..770985b37d98c8663bce5182ea1ab133a5139718 100644
--- a/neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod
+++ b/neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod
@@ -22,9 +22,9 @@
<view>DocumentDrawer_view</view>
</neonViewReference>
<neonViewReference>
- <name>1a103d48-f1d1-4940-acc7-c7097e9c03ad</name>
- <entityField>SalesprojectCompetitions</entityField>
- <view>SalesprojectCompetitionDrawer_view</view>
+ <name>4dcc3fdd-6683-435c-95c1-a59597fc3e71</name>
+ <entityField>Competitions</entityField>
+ <view>CompetitionDrawer_view</view>
</neonViewReference>
</children>
</neonView>