Demodata adjusted. Orderstatus valueprocess fixed. Umsatz Berechnung

nach Belegtyp, versendet und storniert status umgestellt.

.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml

@@ -141,7 +141,7 @@
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="NET" valueNumeric="630.00"/>
+      <column name="NET" valueNumeric="300000.00"/>
       <column name="SALESORDERCODE" valueNumeric="1007"/>
       <column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
@@ -155,8 +155,7 @@
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
       <column name="DELIVERYTERMS" value="FREE"/>
-      <column name="VAT" valueNumeric="119.70"/>
-      <column name="PAID" valueNumeric="545.50"/>
+      <column name="VAT" valueNumeric="30000.70"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="SALESORDER">
@@ -298,12 +297,12 @@
       <column name="SALESORDERID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="ORDERTYPE" value="ORDTYPECONF"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="CANCELLATION" valueNumeric="1"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
       <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="DELIVERYTERMS" value="DELIVERCIF"/>
-      <column name="VAT" valueNumeric="0.00"/>
+      <column name="VAT" valueNumeric="25000.00"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
   </changeSet>

entity/Orderitem_entity/entityfields/orderstatus/valueProcess.js

@@ -4,10 +4,14 @@ import("system.logging");
 import("system.result");
 import("Sql_lib");
 
+if (vars.get("$this.value") == null) 
+{
 var orderNo=vars.get("$param.OrderId_param");
 
 var status = db.array(db.ROW, SqlCondition.begin()
         .andPrepare("SALESORDER.SALESORDERID", orderNo)
         .buildSql("select ORDERSTATUS from SALESORDER", "1 = 0"));
 
-result.string(status);
\ No newline at end of file
+result.string(status);
+}
+

process/Turnover_lib/process.js

@@ -32,6 +32,9 @@ TurnoverUtil.getTurnoverData = function (pMaxYear, pYearCount, pSalesprojectId)
         
     // load data
     var data = db.table(SqlCondition.begin()
+                                    .and("SALESORDER.ORDERTYPE = 'ORDTYPEINVO'")
+                                    .and("SALESORDER.ORDERSTATUS = 1")
+                                    .and("SALESORDER.CANCELLATION <> 1")
                                     .and("SALESORDERITEM.OPTIONAL <> 1")
                                     .andPrepare("SALESORDER.SALESORDERDATE", pMaxYear, "year(#) <= ?", SQLTYPES.INTEGER)
                                     .andPrepare("SALESORDER.SALESORDERDATE", minYear, "year(#) >= ?", SQLTYPES.INTEGER)