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

Belege: fixed Bug für versendeter Beleg mit leere Belegsposten.

Fixed Belege filterview.
parent 80da1821
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,6 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
<title>Receipt</title>
<grantUpdateProcess>%aditoprj%/entity/Order_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Order_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Order_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Order_entity/afterUiInit.js</afterUiInit>
......@@ -40,7 +39,7 @@
</entityField>
<entityField>
<name>SALESORDERDATE</name>
<title>Creation date</title>
<title>Order date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
......
import("system.logging");
import("system.result");
import("system.vars");
import("system.neon");
......@@ -17,6 +16,5 @@ else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
if (vars.get("$field.ChosenTexHeader") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexHeader") + "'", "_____SYSTEMALIAS");
logging.log(binaryId);
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
}
\ No newline at end of file
......@@ -4,7 +4,7 @@ import("system.logging");
import("system.result");
import("Sql_lib");
var orderNo=vars.get("$field.SALESORDER_ID")
var orderNo=vars.get("$param.OrderId_param");
var status = db.array(db.ROW, SqlCondition.begin()
.andPrepare("SALESORDER.SALESORDERID", orderNo)
......
import("Sql_lib");
import("system.db");
import("system.vars");
import("system.result");
import("Order_lib");
var itemcount = db.cell(SqlCondition.begin()
.andPrepareVars("SALESORDERITEM.SALESORDER_ID", "$field.SALESORDER_ID")
.buildSql("select count(*) from SALESORDERITEM", "1=2"));
if (itemcount == "0" && vars.get("$field.OrderStatus") == "1" ) {
result.string(false);
}
else if (itemcount == "0" && vars.get("$field.OrderStatus") == "0"){
result.string(true);
}
else
result.string(OrderUtils.isEditable(vars.get("$field.OrderStatus")));
\ No newline at end of file
......@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Order_lib");
result.string(OrderUtils.isEditable(vars.get("$field.OrderStatus")));
\ No newline at end of file
result.string(OrderUtils.isDeletable(vars.get("$field.OrderStatus")));
\ No newline at end of file
import("Sql_lib");
import("system.db");
import("system.vars");
import("system.result");
import("Order_lib");
var itemcount = db.cell(SqlCondition.begin()
.andPrepareVars("SALESORDERITEM.SALESORDER_ID", "$field.SALESORDER_ID")
.buildSql("select count(*) from SALESORDERITEM", "1=2"));
if (itemcount == "0" && vars.get("$field.OrderStatus") == "1" ) {
result.string(false);
}
else if (itemcount == "0" && vars.get("$field.OrderStatus") == "0"){
result.string(true);
}
else
result.string(OrderUtils.isEditable(vars.get("$field.OrderStatus")));
\ No newline at end of file
......@@ -62,6 +62,10 @@
<name>71f23753-601d-49fa-810d-daa02a1323d8</name>
<entityField>IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>443c8480-5676-43a3-9617-f86dae39c960</name>
<entityField>SALESORDERDATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>dba5604f-cc1b-4083-8115-7bbe1ba07bf4</name>
<entityField>ORDERTYPE</entityField>
......@@ -81,8 +85,12 @@
<entityField>CONTACT_PERSON_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>443c8480-5676-43a3-9617-f86dae39c960</name>
<entityField>SALESORDERDATE</entityField>
<name>513826d9-7bb3-4cdd-b26a-f3c3976a6063</name>
<entityField>ORDERSTATUS</entityField>
</neonTableColumn>
<neonTableColumn>
<name>f0b61831-07b1-41dc-bac6-0e27252f6b74</name>
<entityField>CANCELLATION</entityField>
</neonTableColumn>
<neonTableColumn>
<name>6f55da1e-281c-44ba-ab97-729b75516c32</name>
......
import("system.logging");
import("Context_lib");
import("KeywordRegistry_basic");
import("Neon_lib");
......@@ -56,8 +57,10 @@ OrderUtils.validateOrderNumber = function(orderNumber) {
OrderUtils.getOrderNumberValidationFailString = function() {
return translate.text("The order number already exists!");
}
OrderUtils.isEditable = function(status) {
// TODO: Administrator darf immer ändern, warten auf neue Berechtigungslogik?
// Order should be editable if order state not equals "Sent"
......
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