Skip to content
Snippets Groups Projects
Commit da2053e1 authored by Mohamed Mansour's avatar Mohamed Mansour
Browse files

Fixed demodata. Adjusted OrderStatus field with OrderStatus_param,

adjusted edit und paid views to display PAYDATE
parent 40c0a8ef
No related branches found
No related tags found
No related merge requests found
......@@ -203,7 +203,6 @@
<column name="NET" valueNumeric="0.00"/>
<column name="SALESORDERCODE" valueNumeric="1010"/>
<column name="SALESORDERDATE" valueDate="2019-05-17T02:00:00"/>
<column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
<column name="SALESORDERID" value="a846d596-b9ce-4a73-a842-e9084ebf612a"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
......@@ -214,8 +213,8 @@
<column name="CANCELLATION" valueNumeric="0"/>
<column name="PAYMENTTERMS" value="PAYTERM7"/>
<column name="DELIVERYTERMS" value="FREE"/>
<column name="VAT" valueNumeric="0.00"/>
<column name="PAID" valueNumeric="0.00"/>
<column name="VAT" valueNumeric="0.00"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="SALESORDER">
......@@ -284,6 +283,7 @@
<column name="DUNNINGLEVEL" value="1"/>
<column name="PAYMENTTERMS" value="PAYTERM30"/>
<column name="DELIVERYTERMS" value="DELIVERCIF"/>
<column name="PAID" valueNumeric="10000.00"/>
<column name="VAT" valueNumeric="10165.00"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
......@@ -308,6 +308,7 @@
<column name="DUNNINGLEVEL" value="2"/>
<column name="PAYMENTTERMS" value="PAYTERM7"/>
<column name="DELIVERYTERMS" value="DELIVERCIF"/>
<column name="PAID" valueNumeric="40000.00"/>
<column name="VAT" valueNumeric="0.00"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
......
import("system.vars");
import("system.result");
result.string(vars.get("$field.STATUS"));
\ No newline at end of file
result.string(vars.get("$field.ORDERSTATUS"));
\ No newline at end of file
import("system.vars");
import("system.db");
import("system.result");
import("Sql_lib");
if (vars.get("$this.value") == null) {
if (vars.get("$param.OrderId_param"))
{
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"));
var status = vars.get("$param.OrderStatus_param")
result.string(status);
}
......
......@@ -13,7 +13,7 @@ var itemcount = db.cell(SqlCondition.begin()
if (vars.get("$field.OrderStatus") == undefined){
result.string(false);
}
if (itemcount == "0" && vars.get("$field.OrderStatus") == "1" ) {
else if (itemcount == "0" && vars.get("$field.OrderStatus") == "1" ) {
result.string(false);
}
......
......@@ -13,7 +13,7 @@ var itemcount = db.cell(SqlCondition.begin()
if (vars.get("$field.OrderStatus") == undefined){
result.string(false);
}
if (itemcount == "0" && vars.get("$field.OrderStatus") == "1" ) {
else if (itemcount == "0" && vars.get("$field.OrderStatus") == "1" ) {
result.string(false);
}
......
......@@ -56,10 +56,6 @@
<name>236a3654-dce9-4786-ae13-9b1babd5f75f</name>
<entityField>PAYDUEDATE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>cdd4504c-3af2-414f-9f1a-d8ab646487f1</name>
<entityField>PAYDATE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b42c6333-d6ac-4628-b7b4-509fea676276</name>
<entityField>DELIVERYTERMS</entityField>
......@@ -88,6 +84,10 @@
<name>c4b3c8ed-4625-4785-abc6-c726171ff7f4</name>
<entityField>FOOTER</entityField>
</entityFieldLink>
<entityFieldLink>
<name>cdd4504c-3af2-414f-9f1a-d8ab646487f1</name>
<entityField>PAYDATE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>31ed9eba-66a1-4114-a1fe-61ef475d532d</name>
<entityField>PAID</entityField>
......
......@@ -14,6 +14,10 @@
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>e02ce25c-891d-4285-a42c-8d79ce086bd3</name>
<entityField>PAYDATE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>cb3e76a5-a34f-4e02-bd41-e9acad7fa01a</name>
<entityField>PAID</entityField>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment