Merge branch 'sales_pn_1080761_preiskalkulation_stueckliste' into '2021.1'

[Projekt: xRM-Sales][TicketNr.: 1084720][Angebotsposten löschen aktualisiert Netto Summe nicht]

See merge request xrm/basic!973

entity/Offeritem_entity/Offeritem_entity.aod

@@ -298,6 +298,7 @@
     <dbRecordContainer>
       <name>db</name>
       <maximumDbRows v="0" />
+      <isPageable v="false" />
       <hasDependentRecords v="true" />
       <conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>

entity/Offeritem_entity/recordcontainers/db/onDBDelete.js

@@ -12,19 +12,27 @@ if(oid != "")
     var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): "";
     var oiUtils = new OfferItemUtils(oid);
     var deletedIds = oiUtils.deletePartsList(oiid);
-    oiUtils.reOrgItems();
-    
     deletedIds.push(oiid);
-    var cols = ["NET", "VAT"];
-    var vals = oiUtils.getNetAndVat(deletedIds);
+    oiUtils.reOrgItems();
     
+    var vals = oiUtils.getNetAndVat(deletedIds);    
     var discountedVals = OfferItemUtils.getDiscountedNet(deletedIds, oid, discount);
+    
+    var fieldValues = {
+        NET: vals[0].toString(),
+        VAT: vals[1].toString()
+    };
     if(discountedVals)
     {
-        cols.push("DISCOUNTED_NET", "DISCOUNTED_VAT");
-        vals = vals.concat(discountedVals);
+        Object.assign(fieldValues, {
+            DISCOUNTED_NET: discountedVals[0].toString(),
+            DISCOUNTED_VAT: discountedVals[1].toString()
+        });
     }
     
-    newWhere("SALESORDER.SALESORDERID", oid)
-        .updateData(true, "SALESORDER", cols, null, vals);
+    var config = entities.createConfigForUpdatingRows();
+    config.entity("Offer_entity");
+    config.uid(oid);
+    config.fieldValues(fieldValues);
+    entities.updateRow(config);
 }

entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js

@@ -16,28 +16,23 @@ if(oid != "")
         var oiUtils = new OfferItemUtils(oid);
         var vals = oiUtils.getNetAndVat();
         var discountedVals = OfferItemUtils.getDiscountedNet(null, oid, discount);
-
-        let config = entities.createConfigForUpdatingRows()
-        config.entity("Offer_entity");
-
+    
+        var fieldValues = {
+            NET: vals[0].toString(),
+            VAT: vals[1].toString()
+        };
         if(discountedVals)
         {
-            config.fieldValues({
-                "NET": vals[0],
-                "VAT": vals[1],
-                "DISCOUNTED_NET": discountedVals[0],
-                "DISCOUNTED_VAT": discountedVals[1]
-            });
-        }
-        else
-        {
-            config.fieldValues({
-                "NET": vals[0],
-                "VAT": vals[1]
+            Object.assign(fieldValues, {
+                DISCOUNTED_NET: discountedVals[0].toString(),
+                DISCOUNTED_VAT: discountedVals[1].toString()
             });
         }
-
+    
+        var config = entities.createConfigForUpdatingRows();
+        config.entity("Offer_entity");
         config.uid(oid);
+        config.fieldValues(fieldValues);
         entities.updateRow(config);
     }
     
@@ -80,4 +75,4 @@ if(oid != "")
             db.execute(statements);// no write entity -> performance reason
         }
     }
-}
+}
\ No newline at end of file

entity/Orderitem_entity/Orderitem_entity.aod

@@ -279,6 +279,7 @@
     <dbRecordContainer>
       <name>db</name>
       <maximumDbRows v="0" />
+      <isPageable v="false" />
       <hasDependentRecords v="true" />
       <conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>

entity/Orderitem_entity/recordcontainers/db/onDBDelete.js

-import("system.neon");
+import("system.entities");
 import("system.vars");
-import("system.db");
 import("Order_lib");
 import("Sql_lib");
 
@@ -13,9 +12,14 @@ if(oid != "")
     oiUtils.reOrgItems();
     
     deletedIds.push(oiid);
-    var cols = ["NET", "VAT"];
-    var vals = oiUtils.getNetAndVat(deletedIds);
+    var offerData = oiUtils.getNetAndVat(deletedIds);
     
-    newWhere("SALESORDER.SALESORDERID", oid)
-        .updateData(true, "SALESORDER", cols, null, vals);
-}
+    var config = entities.createConfigForUpdatingRows();
+    config.entity("Order_entity");
+    config.uid(oid);
\ No newline at end of file
+    config.fieldValues({
+        NET: offerData[0].toString(),
+        VAT: offerData[1].toString()
+    });
+    entities.updateRow(config);
+}

entity/Orderitem_entity/recordcontainers/db/onDBInsert.js

@@ -26,24 +26,21 @@ if(oid != "")
     var vals = oiUtils.getNetAndVat();
     var discountedVals = OrderItemUtils.getDiscountedNet(null, oid,  discount);
     
-    let config = entities.createConfigForUpdatingRows()
-    config.entity("Order_entity");
-
-    if(discountedVals){
-        config.fieldValues({
-            "NET": vals[0],
-            "VAT": vals[1],
-            "DISCOUNTED_NET": discountedVals[0],
-            "DISCOUNTED_VAT": discountedVals[1]
-        });
-    }
-    else
+    var fieldValues = {
+        NET: vals[0].toString(),
+        VAT: vals[1].toString()
+    };
+    if(discountedVals)
     {
-        config.fieldValues({
-            "NET": vals[0],
-            "VAT": vals[1]
+        Object.assign(fieldValues, {
+            DISCOUNTED_NET: discountedVals[0].toString(),
+            DISCOUNTED_VAT: discountedVals[1].toString()
         });
     }
+    
+    var config = entities.createConfigForUpdatingRows();
+    config.entity("Order_entity");
     config.uid(oid);
+    config.fieldValues(fieldValues);
     entities.updateRow(config);
-}
+}
\ No newline at end of file

entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js

@@ -14,27 +14,23 @@ if(oid != "")
         var oiUtils = new OrderItemUtils(oid);
         var vals = oiUtils.getNetAndVat();
         var discountedVals = OrderItemUtils.getDiscountedNet(null, oid, discount);
-
-        let config = entities.createConfigForUpdatingRows()
-        config.entity("Order_entity");
-
+    
+        var fieldValues = {
+            NET: vals[0].toString(),
+            VAT: vals[1].toString()
+        };
         if(discountedVals)
         {
-            config.fieldValues({
-                "NET": vals[0],
-                "VAT": vals[1],
-                "DISCOUNTED_NET": discountedVals[0],
-                "DISCOUNTED_VAT": discountedVals[1]
-            });
-        }
-        else
-        {
-            config.fieldValues({
-                "NET": vals[0],
-                "VAT": vals[1]
+            Object.assign(fieldValues, {
+                DISCOUNTED_NET: discountedVals[0].toString(),
+                DISCOUNTED_VAT: discountedVals[1].toString()
             });
         }
+    
+        var config = entities.createConfigForUpdatingRows();
+        config.entity("Order_entity");
         config.uid(oid);
+        config.fieldValues(fieldValues);
         entities.updateRow(config);
     }