Merge branch '1057152_FixOrderItemRemoveOptional' into '2021.0'

1057152 fix order item remove optional

See merge request xrm/basic!652

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>

entity/Orderitem_entity/entityfields/optional/valueProcess.js

-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

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

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>

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>

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>

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>

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]);
 }
 
 /**