From 75e996e687ca1bcdda3a4081f134fc49da8c4fe2 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Wed, 12 Dec 2018 17:15:38 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.:
1029649][Vertrags-Reiter bei anderen Modulen]
---
entity/History_entity/History_entity.aod | 5 -----
entity/Pers_entity/Pers_entity.aod | 1 +
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 3 +++
neonView/OrgMain_view/OrgMain_view.aod | 5 +++++
neonView/PersMain_view/PersMain_view.aod | 5 +++++
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/entity/History_entity/History_entity.aod b/entity/History_entity/History_entity.aod
index fc5829412f..c232c3fa69 100644
--- a/entity/History_entity/History_entity.aod
+++ b/entity/History_entity/History_entity.aod
@@ -77,11 +77,6 @@
</entityDependency>
</dependencies>
</entityIncomingField>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/History_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
<entityField>
<name>USER_NEW</name>
<searchable v="false" />
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 6c918efda8..be5d451062 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -249,6 +249,7 @@
</entityOutgoingField>
<entityOutgoingField>
<name>PersContract_dfo</name>
+ <title>Contracts</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 4a1af49f46..0b979812f8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1172,6 +1172,7 @@
</entry>
<entry>
<key>Document</key>
+ <value>Dokument</value>
</entry>
<entry>
<key>Dateiname</key>
@@ -1225,6 +1226,7 @@
</entry>
<entry>
<key>Documents</key>
+ <value>Dokumente</value>
</entry>
<entry>
<key>New offer version</key>
@@ -1253,6 +1255,7 @@
</entry>
<entry>
<key>Contracts</key>
+ <value>Verträge</value>
</entry>
<entry>
<key>Classification</key>
diff --git a/neonView/OrgMain_view/OrgMain_view.aod b/neonView/OrgMain_view/OrgMain_view.aod
index f50fa84c3e..2ead586af5 100644
--- a/neonView/OrgMain_view/OrgMain_view.aod
+++ b/neonView/OrgMain_view/OrgMain_view.aod
@@ -35,5 +35,10 @@
<entityField>OrgDocument_dfo</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>fd099297-e87d-4ada-b7e7-e04afafbd8b0</name>
+ <entityField>OrgContract_dfo</entityField>
+ <view>ContractFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersMain_view/PersMain_view.aod b/neonView/PersMain_view/PersMain_view.aod
index a153db5f73..ecb69e6bd4 100644
--- a/neonView/PersMain_view/PersMain_view.aod
+++ b/neonView/PersMain_view/PersMain_view.aod
@@ -29,5 +29,10 @@
<entityField>PersDocument_dfo</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ec344a07-7b82-4c54-b06b-30ac5b8599f9</name>
+ <entityField>PersContract_dfo</entityField>
+ <view>ContractFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
--
GitLab