diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod index 9029b8cf06c611321d4af16e0292d94e68422f2f..3de08368ebaf8b9f4be23b65ade7620892979e09 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 8b722378044f1040774ab9e9a4c7eaf9cd7978d4..1a8e676e4e3a44da9da9db7b53e6602fa45f39d5 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 13b398314756354614e1d29773b06da25fd0ef4f..6f8bc2f36707c16c433415b2ea2828268761123e 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 03301c76b78e28c69a855027347f9e3597edf518..73153b0db2592d421b9f9e4c7e8f8a3fe3091c21 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"/>