From 3dfa373fb62055591f7ace4847ed84779d14d78a Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 14 Dec 2018 11:15:53 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1029655][Angebot -
Anordnung der Felder]
---
entity/Offer_entity/Offer_entity.aod | 4 +--
.../_____LANGUAGE_EXTRA.aod | 6 ++--
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 8 ++++--
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 6 ++--
neonView/OfferEdit_view/OfferEdit_view.aod | 24 ++++++++--------
.../OfferPreview_view/OfferPreview_view.aod | 28 +++++++++----------
6 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 3722cf0e14..bdca3e9b29 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -40,7 +40,7 @@
</entityField>
<entityField>
<name>OFFERDATE</name>
- <title>Date</title>
+ <title>Creation date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<mandatory v="true" />
@@ -59,7 +59,7 @@
<entityField>
<name>RELATION_ID</name>
<documentation>%aditoprj%/entity/Offer_entity/entityfields/relation_id/documentation.adoc</documentation>
- <title>Contact / Company</title>
+ <title>Connection</title>
<linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<outgoingField>OfferRelation_dfo</outgoingField>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 77ab27a5df..2ec7ac1661 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -1137,9 +1137,6 @@
<entry>
<key>Timetracking</key>
</entry>
- <entry>
- <key>Contact / Company</key>
- </entry>
<entry>
<key>Price Politics</key>
</entry>
@@ -1254,6 +1251,9 @@
<entry>
<key>weitere Informationen</key>
</entry>
+ <entry>
+ <key>Creation date</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 83aeb9ab78..8aeda943d9 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -857,6 +857,7 @@
</entry>
<entry>
<key>Countries</key>
+ <value>Länder</value>
</entry>
<entry>
<key>Options</key>
@@ -1422,9 +1423,6 @@
<key>Timetracking</key>
<value>Zeiterfassung</value>
</entry>
- <entry>
- <key>Contact / Company</key>
- </entry>
<entry>
<key>Price Politics</key>
</entry>
@@ -1540,6 +1538,10 @@
<entry>
<key>weitere Informationen</key>
</entry>
+ <entry>
+ <key>Creation date</key>
+ <value>Erstellungsdatum</value>
+ </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 9ccbd8aed0..f492c24d7f 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1152,9 +1152,6 @@
<entry>
<key>Timetracking</key>
</entry>
- <entry>
- <key>Contact / Company</key>
- </entry>
<entry>
<key>Price Politics</key>
</entry>
@@ -1269,6 +1266,9 @@
<entry>
<key>weitere Informationen</key>
</entry>
+ <entry>
+ <key>Creation date</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 4500572fc3..3a1b2c29e2 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -21,32 +21,32 @@
<entityField>OfferCode_VersNr_fieldgroup</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>768683f3-08c8-4e85-bb4c-7e5c74a8dec0</name>
- <entityField>OFFERDATE</entityField>
+ <name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
+ <entityField>RELATION_ID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>ac6f81a2-5012-461a-bcf1-4534182b0973</name>
- <entityField>SALESPROJECT_ID</entityField>
+ <name>767a9e6e-596b-4903-aa86-7bc0f66cd037</name>
+ <entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
- <entityField>RELATION_ID</entityField>
+ <name>768683f3-08c8-4e85-bb4c-7e5c74a8dec0</name>
+ <entityField>OFFERDATE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>7ab3eb65-b713-4251-9eb1-3119432565f5</name>
- <entityField>LANGUAGE</entityField>
+ <name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name>
+ <entityField>CURRENCY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ce72d9f3-66ce-4a5e-a5af-c3a82520141d</name>
<entityField>PROBABILITY</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>767a9e6e-596b-4903-aa86-7bc0f66cd037</name>
- <entityField>STATUS</entityField>
+ <name>7ab3eb65-b713-4251-9eb1-3119432565f5</name>
+ <entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name>
- <entityField>CURRENCY</entityField>
+ <name>ac6f81a2-5012-461a-bcf1-4534182b0973</name>
+ <entityField>SALESPROJECT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ed71986f-303c-4118-a895-51ec31ba8775</name>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 4650325bab..42953d69fe 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -20,30 +20,18 @@
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
- <entityFieldLink>
- <name>b120a564-fb97-4ae3-bd3e-13ce25d97834</name>
- <entityField>OFFERDATE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>42befe2f-40c0-4674-b0b1-70ae5523f861</name>
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>423cf3fa-49d7-4c48-bd8f-1fc05a14cb1a</name>
- <entityField>LANGUAGE</entityField>
+ <name>b120a564-fb97-4ae3-bd3e-13ce25d97834</name>
+ <entityField>OFFERDATE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4843f0f0-4ee8-47c2-bc0f-99241bad4c51</name>
<entityField>NET</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>cd72899a-69b2-4fe2-bf58-4fb9f594324e</name>
- <entityField>VAT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>10d8f38b-1e01-45a1-bc57-424284bf87be</name>
- <entityField>TotalGross</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>16d38881-d3d3-4c4d-9f23-39d60eadce8d</name>
<entityField>CURRENCY</entityField>
@@ -52,6 +40,18 @@
<name>037889c4-136c-4e9e-b8e2-ff4f13af13c1</name>
<entityField>PROBABILITY</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>423cf3fa-49d7-4c48-bd8f-1fc05a14cb1a</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>cd72899a-69b2-4fe2-bf58-4fb9f594324e</name>
+ <entityField>VAT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>10d8f38b-1e01-45a1-bc57-424284bf87be</name>
+ <entityField>TotalGross</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>3317b73e-68e8-41a8-a678-89c7c7c8513e</name>
<entityField>SALESPROJECT_ID</entityField>
--
GitLab