From 863db279820380662147c80c098f4c79bd286806 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 7 Dec 2018 09:40:24 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1029591][Preview -
Darstellungslogik]
---
entity/Product_entity/Product_entity.aod | 1 -
entity/Product_entity/entityfields/image/valueProcess.js | 3 +--
neonView/ProductEdit_view/ProductEdit_view.aod | 4 ++++
others/db_changes/struct/create_product.xml | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 9029b8cf06..3de08368eb 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -61,7 +61,6 @@
<tableName>PRODUCT</tableName>
<columnName>MINSTOCK</columnName>
<contentType>NUMBER</contentType>
- <outputFormat>#,##0.##</outputFormat>
</entityField>
<entityField>
<name>PRODUCTCODE</name>
diff --git a/entity/Product_entity/entityfields/image/valueProcess.js b/entity/Product_entity/entityfields/image/valueProcess.js
index 8b72237804..1a8e676e4e 100644
--- a/entity/Product_entity/entityfields/image/valueProcess.js
+++ b/entity/Product_entity/entityfields/image/valueProcess.js
@@ -1,5 +1,4 @@
import("system.vars");
import("system.result");
-import("Keyword_lib");
-result.string("TEXT:" + KeywordUtils.getViewValue("GROUPCODE", vars.getString("$field.GROUPCODEID")) );
\ No newline at end of file
+result.string("TEXT:" + vars.getString("$field.PRODUCTNAME"));
\ No newline at end of file
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index 13b3983147..6f8bc2f367 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -45,6 +45,10 @@
<name>a068f12a-ed45-4997-9e94-c865ccffee2a</name>
<entityField>UNIT</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>0c921c3d-df1a-4794-862b-6d190d6ef04e</name>
+ <entityField>RELATION_ID</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/others/db_changes/struct/create_product.xml b/others/db_changes/struct/create_product.xml
index 03301c76b7..73153b0db2 100644
--- a/others/db_changes/struct/create_product.xml
+++ b/others/db_changes/struct/create_product.xml
@@ -7,7 +7,7 @@
</column>
<column name="ADVERTISING" type="CHAR(1)"/>
<column name="GROUPCODEID" type="INTEGER"/>
- <column name="MINSTOCK" type="NUMERIC(14,2)"/>
+ <column name="MINSTOCK" type="INTEGER"/>
<column name="RELATION_ID" type="CHAR(36)"/>
<column name="PRODUCTCODE" type="VARCHAR(50)">
<constraints nullable="false" unique="true" uniqueConstraintName="UNIQUE_PRODUCT_PRODUCTCODE"/>
--
GitLab