diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 157b48c9df17d6e4eb57dab64721f5912cdc786f..4ae9c67736e5f615e791061141b4fd1532d54153 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1962,6 +1962,175 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>STOCK</name>
+ <dbName></dbName>
+ <idColumn>STOCKID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>REFNUMBER</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>STOCKID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>WAREHOUSE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>QUANTITY</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2" />
+ <size v="14" />
+ <scale v="2" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ENTRYDATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>PRODUCT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="true" />
+ <title></title>
+ <description></description>
+ <dependencies>
+ <entityDependency>
+ <name>1d99d9fe-4956-4fd4-9f67-32b1c731dcc1</name>
+ <entityName>PRODUCT</entityName>
+ <fieldName>PRODUCTID</fieldName>
+ </entityDependency>
+ </dependencies>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>IN_OUT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 8b9917727f9fa02d2974c51496a1867c021898f0..aa87c91ce0b841ec76f18e4affe47fd9a319f042 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -179,6 +179,23 @@
</entityDependency>
</dependencies>
</entityIncomingField>
+ <entityOutgoingField>
+ <name>ProductStock_dfo</name>
+ <title>Stock</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <caption>Stock</caption>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Stock_entity</entityName>
+ <fieldName>ProductStock_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <code>%aditoprj%/entity/Product_entity/entityfields/productstock_dfo/children/productid_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Product_entity/entityfields/productstock_dfo/children/productid_param/code.js b/entity/Product_entity/entityfields/productstock_dfo/children/productid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..24f19f37786781bff6661183f3fcd8ae8d1efb45
--- /dev/null
+++ b/entity/Product_entity/entityfields/productstock_dfo/children/productid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/pricelist_relation/onValueChange.js b/entity/Productprice_entity/entityfields/pricelist_relation/onValueChange.js
index 10ce24bdd67df59fc4264eae6fb095b58036adc1..d8c3dba368e8d5d48a48b464b716b452b29459ab 100644
--- a/entity/Productprice_entity/entityfields/pricelist_relation/onValueChange.js
+++ b/entity/Productprice_entity/entityfields/pricelist_relation/onValueChange.js
@@ -1,4 +1,4 @@
-import("system.neon");
-import("system.vars");
-
-neon.setFieldValue("$field.PRICELIST", vars.get("$local.value"));
\ No newline at end of file
+//import("system.neon");
+//import("system.vars");
+//
+//neon.setFieldValue("$field.PRICELIST", vars.get("$local.value"));
\ No newline at end of file
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..695e012d5449a2af9b25969fc5ca7b4f0be9b671
--- /dev/null
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
+ <name>Stock_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Stock_entity/conditionProcess.js</conditionProcess>
+ <recordContainerType>DB</recordContainerType>
+ <entityFields>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <tableName>STOCK</tableName>
+ <columnName>DATE_EDIT</columnName>
+ <contentType>DATE</contentType>
+ <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <tableName>STOCK</tableName>
+ <columnName>DATE_NEW</columnName>
+ <contentType>DATE</contentType>
+ <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ENTRYDATE</name>
+ <tableName>STOCK</tableName>
+ <columnName>ENTRYDATE</columnName>
+ <caption>Date</caption>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/entrydate/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>IN_OUT</name>
+ <tableName>STOCK</tableName>
+ <columnName>IN_OUT</columnName>
+ <caption>I / O</caption>
+ <contentType>TEXT</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/Stock_entity/entityfields/in_out/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityField>
+ <name>PRODUCT_ID</name>
+ <tableName>STOCK</tableName>
+ <columnName>PRODUCT_ID</columnName>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/product_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>QUANTITY</name>
+ <tableName>STOCK</tableName>
+ <columnName>QUANTITY</columnName>
+ <caption>Menge</caption>
+ <contentType>NUMBER</contentType>
+ <outputFormat></outputFormat>
+ </entityField>
+ <entityField>
+ <name>REFNUMBER</name>
+ <tableName>STOCK</tableName>
+ <columnName>REFNUMBER</columnName>
+ <caption>Reference</caption>
+ </entityField>
+ <entityField>
+ <name>STOCKID</name>
+ <tableName>STOCK</tableName>
+ <columnName>STOCKID</columnName>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <tableName>STOCK</tableName>
+ <columnName>USER_EDIT</columnName>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <tableName>STOCK</tableName>
+ <columnName>USER_NEW</columnName>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>WAREHOUSE</name>
+ <tableName>STOCK</tableName>
+ <columnName>WAREHOUSE</columnName>
+ <caption>Warehouse</caption>
+ <possibleItemsProcess>%aditoprj%/entity/Stock_entity/entityfields/warehouse/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityIncomingField>
+ <name>ProductStock_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>ProductStock_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
+ </entityFields>
+ <linkInformation>
+ <linkInformation>
+ <name>f8caac29-1e0d-4cf5-9137-fedd6a765d55</name>
+ <tableName>STOCK</tableName>
+ <primaryKey>STOCKID</primaryKey>
+ <isUIDTable v="true" />
+ </linkInformation>
+ </linkInformation>
+</entity>
diff --git a/entity/Stock_entity/conditionProcess.js b/entity/Stock_entity/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..35ef2ecc7bdabe34ed689e2db72553356afde5a4
--- /dev/null
+++ b/entity/Stock_entity/conditionProcess.js
@@ -0,0 +1,8 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != null)
+ result.string("STOCK.PRODUCT_ID = ('" + vars.getString("$param.ProductId_param") + "')");
+else
+ result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/date_edit/valueProcess.js b/entity/Stock_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..00e95d744eab3b281e0f6ae5ee325cee91419534
--- /dev/null
+++ b/entity/Stock_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/date_new/valueProcess.js b/entity/Stock_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ace62531432fbfb08b15fc33e25d271dc34bd6a
--- /dev/null
+++ b/entity/Stock_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/entrydate/valueProcess.js b/entity/Stock_entity/entityfields/entrydate/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ace62531432fbfb08b15fc33e25d271dc34bd6a
--- /dev/null
+++ b/entity/Stock_entity/entityfields/entrydate/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/in_out/possibleItemsProcess.js b/entity/Stock_entity/entityfields/in_out/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e87580dcd9e538b55135c0ffb2d179fd5d352f98
--- /dev/null
+++ b/entity/Stock_entity/entityfields/in_out/possibleItemsProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.translate");
+
+result.object([
+ ["1", translate.text("IN")],
+ ["-1", translate.text("OUT")]
+ ]);
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/product_id/valueProcess.js b/entity/Stock_entity/entityfields/product_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4428a4ab94878205e5ce66644189ed3cb07b2e1b
--- /dev/null
+++ b/entity/Stock_entity/entityfields/product_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+ if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != null && vars.get("$param.ProductId_param") != "")
+ result.string(vars.getString("$param.ProductId_param"));
+}
+
diff --git a/entity/Stock_entity/entityfields/stockid/valueProcess.js b/entity/Stock_entity/entityfields/stockid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5be18c39832eee52e38b7147961d7db4bab5a588
--- /dev/null
+++ b/entity/Stock_entity/entityfields/stockid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/user_edit/valueProcess.js b/entity/Stock_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67c86b14ca987054658978c88cecf6bd03fa44af
--- /dev/null
+++ b/entity/Stock_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/user_new/valueProcess.js b/entity/Stock_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..81966a3fbcd9b3cf25a186c93baa1928abc9d6d2
--- /dev/null
+++ b/entity/Stock_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/warehouse/possibleItemsProcess.js b/entity/Stock_entity/entityfields/warehouse/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f2f6ce317e1e0a5188118a66a2fbe3ec299afecc
--- /dev/null
+++ b/entity/Stock_entity/entityfields/warehouse/possibleItemsProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("Keyword_lib");
+
+var kwdUtils, items;
+
+kwdUtils = new KeywordUtils();
+items = kwdUtils.getStandardArray("STOCK.WAREHOUSE");
+result.object(items);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 768dbbbc82556253fa5ef2eb06ef82aefd7ed05d..b51d31b0de64ad3e7b198ae135c5ba3f40b08c23 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -501,6 +501,36 @@
<entry>
<key>Standard</key>
</entry>
+ <entry>
+ <key>I / O</key>
+ </entry>
+ <entry>
+ <key>Date</key>
+ </entry>
+ <entry>
+ <key>IN</key>
+ </entry>
+ <entry>
+ <key>OUT</key>
+ </entry>
+ <entry>
+ <key>Menge</key>
+ </entry>
+ <entry>
+ <key>Warehouse</key>
+ </entry>
+ <entry>
+ <key>Warehouse 2</key>
+ </entry>
+ <entry>
+ <key>Warehouse 1</key>
+ </entry>
+ <entry>
+ <key>Warehouse 3</key>
+ </entry>
+ <entry>
+ <key>Reference</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 8171d46edae90297f0f00c76f323388e6b1f73f1..1e584c40ab02e20a4eff1d5e116e555f261a9448 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -330,6 +330,7 @@
</entry>
<entry>
<key>Vorläufig</key>
+ <value></value>
</entry>
<entry>
<key>Monatliche Serie nicht genauer spezifiziert. Ignoriere Serie.</key>
@@ -657,6 +658,46 @@
<entry>
<key>Standard</key>
</entry>
+ <entry>
+ <key>I / O</key>
+ <value>E / A</value>
+ </entry>
+ <entry>
+ <key>Date</key>
+ <value>Datum</value>
+ </entry>
+ <entry>
+ <key>IN</key>
+ <value>EIN</value>
+ </entry>
+ <entry>
+ <key>OUT</key>
+ <value>AUS</value>
+ </entry>
+ <entry>
+ <key>Menge</key>
+ <value>Quantity</value>
+ </entry>
+ <entry>
+ <key>Warehouse</key>
+ <value>Lager</value>
+ </entry>
+ <entry>
+ <key>Warehouse 2</key>
+ <value>Lager 2</value>
+ </entry>
+ <entry>
+ <key>Warehouse 1</key>
+ <value>Lager 1</value>
+ </entry>
+ <entry>
+ <key>Warehouse 3</key>
+ <value>Lager 3</value>
+ </entry>
+ <entry>
+ <key>Reference</key>
+ <value>Referenz</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 2c4df600c3dd16adc51858549d9cc73488f7dff6..4c60221d567bd302be3a1afb36643c31f15f5e39 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -509,6 +509,36 @@
<entry>
<key>Standard</key>
</entry>
+ <entry>
+ <key>I / O</key>
+ </entry>
+ <entry>
+ <key>Date</key>
+ </entry>
+ <entry>
+ <key>IN</key>
+ </entry>
+ <entry>
+ <key>OUT</key>
+ </entry>
+ <entry>
+ <key>Menge</key>
+ </entry>
+ <entry>
+ <key>Warehouse</key>
+ </entry>
+ <entry>
+ <key>Warehouse 2</key>
+ </entry>
+ <entry>
+ <key>Warehouse 1</key>
+ </entry>
+ <entry>
+ <key>Warehouse 3</key>
+ </entry>
+ <entry>
+ <key>Reference</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Stock_context/Stock_context.aod b/neonContext/Stock_context/Stock_context.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f9bebb231c0b9f33062ef3c1a625a32bb332149f
--- /dev/null
+++ b/neonContext/Stock_context/Stock_context.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+ <name>Stock_context</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>StockFilter_view</filterview>
+ <editview>StockEdit_view</editview>
+ <entity>Stock_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>cf5ed980-dc4f-40b2-9e85-cad631bd1c85</name>
+ <view>StockFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>29d6a038-220f-411c-95ac-335e6779b1fa</name>
+ <view>StockEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index cf91f92c954b9da509f9581beb113858b1805234..fb403a674b627419e97cfa8eb220458dbbd99f48 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -19,5 +19,10 @@
<entityField>ProductProductprice_dfo</entityField>
<view>ProductpriceFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>076b1373-def3-4f1b-8228-51410cc9decf</name>
+ <entityField>ProductStock_dfo</entityField>
+ <view>StockFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
index 08c9f461da47de56e9a03e61f2182c371a4a888e..c3b1ebfd15c231d4f665ba9a71237d80b848ff95 100644
--- a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
+++ b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
@@ -2,7 +2,7 @@
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>ProductpriceFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <quickAdd v="true" />
+ <quickAdd v="false" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/StockEdit_view/StockEdit_view.aod b/neonView/StockEdit_view/StockEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..14e1a6c4b107aa7424c1bf7ec0e5e8d0c1a1b244
--- /dev/null
+++ b/neonView/StockEdit_view/StockEdit_view.aod
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+ <name>StockEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Generic_template</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>4c474e8e-ad47-484a-91fb-a8bd6390e0af</name>
+ <entityField>WAREHOUSE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>588e46dd-4761-47cb-87c3-a483f69fecae</name>
+ <entityField>ENTRYDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9f8426c6-84d6-4065-880a-805ebecb6638</name>
+ <entityField>IN_OUT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8004c2e8-5ef1-480c-9381-dad3cd574dca</name>
+ <entityField>QUANTITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>591e6fbd-d392-458e-a79a-d20e9cb845d3</name>
+ <entityField>REFNUMBER</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/StockFilter_view/StockFilter_view.aod b/neonView/StockFilter_view/StockFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..65c6327aa9c98380282a64c41b0c2e35e3128028
--- /dev/null
+++ b/neonView/StockFilter_view/StockFilter_view.aod
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+ <name>StockFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table_template</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>135080e7-1d91-4be2-8bdb-8368e247127d</name>
+ <entityField>WAREHOUSE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1a744bfe-b078-4ac4-a930-f1c8cd3ecac7</name>
+ <entityField>ENTRYDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fea73255-6fd2-4a32-8e53-37f47fa57ac1</name>
+ <entityField>IN_OUT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a5dcfc3a-c464-4c63-bd2d-ebe4d195b45b</name>
+ <entityField>QUANTITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>82f57c96-613e-4699-925d-a49a0ef8a29f</name>
+ <entityField>REFNUMBER</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml
index 16175150af5e61461b43ce78da813153ccdfb548..20602decea6f75ebb66d4af9b47d3ee0272275ad 100644
--- a/others/db_changes/masterChangelog.xml
+++ b/others/db_changes/masterChangelog.xml
@@ -12,6 +12,7 @@
<include file="struct/create_product.xml"/>
<include file="struct/create_prod2prod.xml"/>
<include file="struct/create_productprice.xml"/>
+ <include file="struct/create_stock.xml"/>
<include file="misc/1535533490181_persChanges.xml"/>
<include file="struct/1535612802325_addressChange.xml"/>
<include file="data/example_org/ORG_privat.xml"/>
diff --git a/others/db_changes/struct/create_stock.xml b/others/db_changes/struct/create_stock.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5450df334f226cfa463115fa86e56d53dd65e92b
--- /dev/null
+++ b/others/db_changes/struct/create_stock.xml
@@ -0,0 +1,26 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+<changeSet author="m.schroeger" id="1f68f308-a82d-4e68-82c0-aa2bb6e8a8f1">
+ <createTable tableName="STOCK">
+ <column name="STOCKID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_STOCK_STOCKID"/>
+ </column>
+ <column name="IN_OUT" type="INTEGER"/>
+ <column name="QUANTITY" type="NUMERIC(14,2)"/>
+ <column name="REFNUMBER" type="VARCHAR(50)"/>
+ <column name="PRODUCT_ID" type="CHAR(36)">
+ <constraints nullable="false" foreignKeyName="FK_STOCK_PRODUCT_ID" references="PRODUCT(PRODUCTID)"/>
+ </column>
+ <column name="ENTRYDATE" type="TIMESTAMP"/>
+ <column name="WAREHOUSE" type="INTEGER"/>
+ <column name="DATE_EDIT" type="TIMESTAMP"/>
+ <column name="DATE_NEW" type="TIMESTAMP">
+ <constraints nullable="false"/>
+ </column>
+ <column name="USER_EDIT" type="VARCHAR(50)"/>
+ <column name="USER_NEW" type="VARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ </createTable>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index c40a5412ac8e991f875b70c11398f045a9c12b4e..5a86e8886e47eff2e87bf296b0d76cca698c22b9 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -178,6 +178,13 @@ function KeywordUtils(){
,createKeywordEntry("4", translate.text("CHF"))
]);
break;
+ case "STOCK.WAREHOUSE":
+ valueContainer = createKeywordEntriesContainer([
+ createKeywordEntry("1", translate.text("Warehouse 1"))
+ ,createKeywordEntry("2", translate.text("Warehouse 2"))
+ ,createKeywordEntry("3", translate.text("Warehouse 3"))
+ ]);
+ break;
default:
throw new Error(translate.withArguments("[%0]the given keyword \"%1\" has no match with the possible keywordlist", [
arguments.callee.name, keywordType