From 44a785b942858980f14a079fce1fb75250d361ac Mon Sep 17 00:00:00 2001 From: Johannes Hoermann <j.hoermann@adito.de> Date: Fri, 25 Jan 2019 15:02:42 +0100 Subject: [PATCH] salesproject fixes --- .../SalesprojectCompetition_entity.aod | 6 +++--- .../SalesprojectForecast_entity.aod | 1 + .../SalesprojectForecastEdit_view.aod | 8 ++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod index 3011a9e2bd..c6e39d5a74 100644 --- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod +++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod @@ -142,18 +142,18 @@ <conditionProcess>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js</conditionProcess> <linkInformation> <linkInformation> - <name>40929203-c34a-4320-b83d-57a60c851a89</name> + <name>d34f0a49-d8c1-4024-84ef-fdd1a7acd326</name> <tableName>SALESPROJECT_COMPETITION</tableName> <primaryKey>SALESPROJECT_COMPETITIONID</primaryKey> <isUIDTable v="true" /> <readonly v="false" /> </linkInformation> <linkInformation> - <name>efb1f8fb-8451-4cc9-a25f-b896d5e1ae53</name> + <name>c1f6867a-e913-4f3f-a0b8-ea0a44f71d3c</name> <tableName>ORG</tableName> <primaryKey>ORGID</primaryKey> <isUIDTable v="false" /> - <readonly v="false" /> + <readonly v="true" /> </linkInformation> </linkInformation> <recordFieldMappings> diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod index 099ec6b1fe..04eca20d0a 100644 --- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod +++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod @@ -33,6 +33,7 @@ </entityField> <entityField> <name>RELATION_ID</name> + <mandatory v="true" /> </entityField> <entityField> <name>SALESPROJECT_FORECASTID</name> diff --git a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod b/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod index 556692b6a5..c215032af8 100644 --- a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod +++ b/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod @@ -14,8 +14,8 @@ <entityField>#ENTITY</entityField> <fields> <entityFieldLink> - <name>1100a2dd-b79d-4bcb-99d3-246a0db4346a</name> - <entityField>TYPE</entityField> + <name>8c7e16f6-222d-4f8a-9cc6-74de1a0ee481</name> + <entityField>GROUPCODE</entityField> </entityFieldLink> <entityFieldLink> <name>fefae7ed-072c-4c48-92fd-d3fa6ccd0711</name> @@ -29,6 +29,10 @@ <name>f5e95dd2-c853-48be-ad18-e5fdbe714873</name> <entityField>INFO</entityField> </entityFieldLink> + <entityFieldLink> + <name>382caf7e-d3db-4bac-af99-a95d62504da7</name> + <entityField>RELATION_ID</entityField> + </entityFieldLink> </fields> </genericViewTemplate> </children> -- GitLab