From 0e8708334b33c57b3dadd1bb14487b8e7dc1958e Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 13 Feb 2019 10:47:10 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1032645][Vertrieb -
Produkt - Spalte Einheit fehlt bei Tabelle in FilterView] [Projekt:
Entwicklung - Neon][TicketNr.: 1032623][Vertriebsprojekt - Projekttitel statt
Projektnummer in der Preview (CardView)]
---
entity/Language_entity/Language_entity.aod | 6 ++++++
entity/Offer_entity/titleProcess.js | 2 +-
entity/Order_entity/titleProcess.js | 3 ++-
entity/Product_entity/Product_entity.aod | 13 +++++++++++++
.../ProductDescription_view.aod | 4 ++++
neonView/ProductFilter_view/ProductFilter_view.aod | 6 ++++++
.../SalesprojectPreview_view.aod | 4 ++--
7 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index cccbaa07d98..fc9ea4230c8 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -56,6 +56,12 @@
<fieldName>Languages</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>0b2dd6bf-933f-4476-9071-de9d5e23800b</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Languages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
</entityFields>
diff --git a/entity/Offer_entity/titleProcess.js b/entity/Offer_entity/titleProcess.js
index 98f9e420320..b5301f43f0d 100644
--- a/entity/Offer_entity/titleProcess.js
+++ b/entity/Offer_entity/titleProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.OfferCode_VersNr_fieldgroup"));
\ No newline at end of file
+result.string(vars.get("$field.Offer_OfferCode_VersNr_fieldgroup"));
\ No newline at end of file
diff --git a/entity/Order_entity/titleProcess.js b/entity/Order_entity/titleProcess.js
index 3be6f1aec47..f9b8aea4a9a 100644
--- a/entity/Order_entity/titleProcess.js
+++ b/entity/Order_entity/titleProcess.js
@@ -1,4 +1,5 @@
+import("system.translate");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.OrderCode_VersNr_fieldgroup"));
\ No newline at end of file
+result.string(translate.text("Receipt") + " " + vars.get("$field.OrderCode_VersNr_fieldgroup"));
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 06f264c6adf..75d73343fb7 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -262,6 +262,19 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>LANGUAGE</name>
+ <consumer>Languages</consumer>
+ </entityField>
+ <entityConsumer>
+ <name>Languages</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>LanguagesISO3Code</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/neonView/ProductDescription_view/ProductDescription_view.aod b/neonView/ProductDescription_view/ProductDescription_view.aod
index dce754db029..1443c025a55 100644
--- a/neonView/ProductDescription_view/ProductDescription_view.aod
+++ b/neonView/ProductDescription_view/ProductDescription_view.aod
@@ -15,6 +15,10 @@
<drawerCaption>Description</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>f0743860-a2f8-4c9c-998f-200ad1e67bb2</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>cd7cd596-0f25-4067-9aac-5ee188a3af64</name>
<entityField>INFO</entityField>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index 6447cd59885..61722b79c84 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -50,6 +50,12 @@
<name>346eab87-8fea-4828-8ea6-86af61f973ce</name>
<entityField>GROUPCODEID</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>9cfc7b76-3d75-4a26-a21f-3b2b1a2faac5</name>
+ <entityField>UNIT</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
<neonTableColumn>
<name>3e774e1c-0998-4b2c-b876-22e99a79cb55</name>
<entityField>STATUS</entityField>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index ab4378e8fd7..1fa433506d5 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -11,8 +11,8 @@
<cardViewTemplate>
<name>SalesprojectPreview_template</name>
<iconField>IMAGE</iconField>
- <titleField>PROJECTCODE</titleField>
- <descriptionField>PROJECTTITLE</descriptionField>
+ <titleField>PROJECTTITLE</titleField>
+ <descriptionField>PROJECTCODE</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
--
GitLab