diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 6a02b00aea28efcf29007d0437180314c300cf2c..a7fc74a48c9cedbd3350662df1c5bd003fb3c5c2 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -54,12 +54,6 @@
<name>SALESORDER_ID</name>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorder_id/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>OPTIONAL</name>
- <title>Optional</title>
- <contentType>BOOLEAN</contentType>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
- </entityField>
<entityField>
<name>PRICE</name>
<title>Unit price</title>
@@ -146,6 +140,20 @@
<entityProvider>
<name>Orderitems</name>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -168,20 +176,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>INFO</name>
@@ -190,6 +184,11 @@
</entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -197,14 +196,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -212,11 +211,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Products</name>
@@ -294,12 +288,6 @@
<name>SALESORDER_ID.value</name>
<recordfield>SALESORDERITEM.SALESORDER_ID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OPTIONAL.value</name>
- <recordfield>SALESORDERITEM.OPTIONAL</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRICE.value</name>
<recordfield>SALESORDERITEM.PRICE</recordfield>
diff --git a/entity/Orderitem_entity/entityfields/optional/valueProcess.js b/entity/Orderitem_entity/entityfields/optional/valueProcess.js
deleted file mode 100644
index d7871520525122be1a8680a7e579397a16cb03b3..0000000000000000000000000000000000000000
--- a/entity/Orderitem_entity/entityfields/optional/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-
-
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null){
- result.string("0");
-}
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js b/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js
index 19143f2678a0dda4003dc1cd9a3ede43550cf017..17b746c4e0118990016abedd2e4ac9fcd375891d 100644
--- a/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js
+++ b/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js
@@ -5,4 +5,4 @@ import("Order_lib");
var oiUtils = new OrderItemUtils(vars.get("$field.SALESORDER_ID"));
result.string(oiUtils.roundPrice(oiUtils.getItemSum(vars.get("$field.QUANTITY"), vars.get("$field.PRICE")
- , vars.get("$field.DISCOUNT"), vars.get("$field.OPTIONAL"))));
\ No newline at end of file
+ , vars.get("$field.DISCOUNT"))));
\ No newline at end of file
diff --git a/neonView/OrderitemEdit_view/OrderitemEdit_view.aod b/neonView/OrderitemEdit_view/OrderitemEdit_view.aod
index 7d0898028183d97a94d5f0933592d02398e24d93..0a0b6d9d563c258bef7bd4ec2435fb2598d8aa0f 100644
--- a/neonView/OrderitemEdit_view/OrderitemEdit_view.aod
+++ b/neonView/OrderitemEdit_view/OrderitemEdit_view.aod
@@ -45,7 +45,6 @@
</entityFieldLink>
<entityFieldLink>
<name>242825ab-fd74-4be5-b8c8-bf945a501494</name>
- <entityField>OPTIONAL</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ff49cd49-d539-4c43-b9c7-822360ae6881</name>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index bfdfcf077f69b819c2b1d69c38480cdcf7ff5bab..e6d57de59489eb3bb0432d4c40f660e85e831c8d 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -43,10 +43,6 @@
<name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
<entityField>DISCOUNT</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
- <entityField>OPTIONAL</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>eecc066d-e380-4fe7-9e9b-99d80842981d</name>
<entityField>TotalPrice</entityField>
@@ -89,10 +85,6 @@
<name>0c533079-4b39-4412-8de5-086bf7a08706</name>
<entityField>DISCOUNT</entityField>
</neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>9ac44050-ea77-43d2-b0fe-f7ca411b91e7</name>
- <entityField>OPTIONAL</entityField>
- </neonTreeTableColumn>
<neonTreeTableColumn>
<name>c44b5bc2-4283-4dca-bd20-bd048e05fe45</name>
<entityField>TotalPrice</entityField>
diff --git a/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod b/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
index 708d17854c4c5e36cb20e545a5ff32d44644a3f5..b7f92413ff0aaa1c4c7217f832f734ad4c791b99 100644
--- a/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
+++ b/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
@@ -41,10 +41,6 @@
<name>d0255477-0e96-48eb-9596-c5ab523a2622</name>
<entityField>VAT</entityField>
</neonGenericMultipleTableColumn>
- <neonGenericMultipleTableColumn>
- <name>c60f6315-5b63-4c4a-96fa-eaa99b94646e</name>
- <entityField>OPTIONAL</entityField>
- </neonGenericMultipleTableColumn>
<neonGenericMultipleTableColumn>
<name>96f0b5bd-6187-44ad-aac0-15ac262e30a2</name>
<entityField>INFO</entityField>
diff --git a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
index 4a4081bce85de573239dfad8ad8c1b998ffc1b29..f2c8a1df6c9a02c7e097ec3a1d42cf388491f381 100644
--- a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
+++ b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
@@ -48,7 +48,6 @@
</entityFieldLink>
<entityFieldLink>
<name>1cfd6a95-4789-43aa-941c-6f69eeedd6b2</name>
- <entityField>OPTIONAL</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index b2ea2f15dfa4c5bbd8712f1d48c1c84c8bd26f2d..5c4d7f122ab9714f382ab2a4fdc1b81350c070f7 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -652,7 +652,7 @@ OrderItemUtils.prototype.initItemTree = function() {
* For documentation, see class ItemUtils.
*/
OrderItemUtils.prototype.getItemSum = function(pQuantity, pPrice, pDiscount, pOptional) {
- return ItemUtils.prototype.getItemSum.apply(this, [pQuantity, pPrice, pDiscount, pOptional]);
+ return ItemUtils.prototype.getItemSum.apply(this, [pQuantity, pPrice, pDiscount, false]);
}
/**