diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 02c4894a77d937c4b0072d79aa7d92bb98f19a6e..a82c125e7812bc597e87dc559e21f11a23f1d625 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -999,6 +999,20 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>LANGUAGE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="1" /> + <size v="3" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod index f77b0699c93de2d3bf86384f67be97ae5e18c2d1..626690b5570dbefb1a86778d1d1d6009733434f3 100644 --- a/entity/Product_entity/Product_entity.aod +++ b/entity/Product_entity/Product_entity.aod @@ -264,6 +264,7 @@ </entityConsumer> <entityField> <name>LANGUAGE</name> + <title>Language</title> <consumer>Languages</consumer> </entityField> <entityConsumer> @@ -380,6 +381,14 @@ <name>UNIT.displayValue</name> <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>LANGUAGE.value</name> + <recordfield>PRODUCT.LANGUAGE</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>LANGUAGE.displayValue</name> + <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression> + </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> </recordContainers> diff --git a/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js b/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js new file mode 100644 index 0000000000000000000000000000000000000000..368c9593d9bde80e463b49879026c47394294f12 --- /dev/null +++ b/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js @@ -0,0 +1,5 @@ +import("system.result"); +import("Keyword_lib"); + +var sql = LanguageKeywordUtils.getResolvedTitleSqlPart("PRODUCT.LANGUAGE"); +result.string(sql); diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod index 30d90fe81d884683367e9e9e9aba42f847e53518..41bf0883f27b1183420e034cef8489fef0bf23d5 100644 --- a/neonView/ProductEdit_view/ProductEdit_view.aod +++ b/neonView/ProductEdit_view/ProductEdit_view.aod @@ -37,6 +37,10 @@ <name>0019c5bd-368f-457a-b6e3-dd1d12cbe19e</name> <entityField>PRODUCTNAME</entityField> </entityFieldLink> + <entityFieldLink> + <name>5882a13d-3f07-4017-ad5b-042ee49c67d4</name> + <entityField>LANGUAGE</entityField> + </entityFieldLink> <entityFieldLink> <name>07f4aa57-24e9-4ce2-8b81-c4a3e8bcbce6</name> <entityField>INFO</entityField> diff --git a/others/db_changes/data_alias/struct/create_product.xml b/others/db_changes/data_alias/struct/create_product.xml index 595fc777817bdab99a36beafbd52391fb4fb01f0..1047d6c1dc1619d1e201099107a938fffa84d177 100644 --- a/others/db_changes/data_alias/struct/create_product.xml +++ b/others/db_changes/data_alias/struct/create_product.xml @@ -13,6 +13,7 @@ <constraints nullable="false" unique="true" uniqueConstraintName="UNIQUE_PRODUCT_PRODUCTCODE"/> </column> <column name="PRODUCTNAME" type="NVARCHAR(50)"/> + <column name="LANGUAGE" type="CHAR(3)"/> <column name="INFO" type="NCLOB"/> <column name="STATUS" type="INTEGER"/> <column name="UNIT" type="CHAR(36)"/>