Skip to content
Snippets Groups Projects
Commit bd00341a authored by Andreas Schindlbeck's avatar Andreas Schindlbeck
Browse files

Merge origin/master

parents 3c0d18fd d134569b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 324 additions and 7 deletions
entity/Productprice_entity/Productprice_entity.aod
+ 88
− 5
View file @ bd00341a
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
<name>Productprice_entity</name>
<title>Price list</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>Data_alias</alias>
<recordContainerType>DB</recordContainerType>
<caption>Price list</caption>
<entityFields>
<entityField>
<name>BUYSELL</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>BUYSELL</columnName>
<caption>EK/VK</caption>
<caption>PP/SP</caption>
<mandatory v="true" />
<mandatoryProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/mandatoryProcess.js</mandatoryProcess>
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>CURRENCY</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>CURRENCY</columnName>
<caption>Währung</caption>
<caption>Currency</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
......@@ -39,7 +44,7 @@
<name>FROMQUANTITY</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>FROMQUANTITY</columnName>
<caption>ab Stückzahl</caption>
<caption>From no. of units</caption>
<contentType>NUMBER</contentType>
<outputFormat>#,##0</outputFormat>
</entityField>
......@@ -47,24 +52,34 @@
<name>PRICE</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>PRICE</columnName>
<caption>Preis</caption>
<caption>Price</caption>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<mandatory v="true" />
</entityField>
<entityField>
<name>PRODUCTPRICEID</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>PRODUCTPRICEID</columnName>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productpriceid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PRODUCT_ID</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>PRODUCT_ID</columnName>
<caption>Product name</caption>
<linkedContext>Product_context</linkedContext>
<mandatory v="true" />
<outgoingField>ProductpriceProduct_dfo</outgoingField>
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/valueProcess.js</valueProcess>
<fieldIdProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/fieldIdProcess.js</fieldIdProcess>
</entityField>
<entityField>
<name>RELATION_ID</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>RELATION_ID</columnName>
<caption>Company</caption>
</entityField>
<entityField>
<name>USER_EDIT</name>
......@@ -82,22 +97,37 @@
<name>VALID_FROM</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>VALID_FROM</columnName>
<caption>Valid from</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<mandatory v="true" />
<onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/onValidation.js</onValidation>
</entityField>
<entityField>
<name>VALID_TO</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>VALID_TO</columnName>
<caption>Valid until</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_to/onValidation.js</onValidation>
</entityField>
<entityField>
<name>VAT</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>VAT</columnName>
<caption>VAT</caption>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<mandatory v="true" />
</entityField>
<entityField>
<name>PRICELIST</name>
<tableName>PRODUCTPRICE</tableName>
<columnName>PRICELIST</columnName>
<caption>Price list</caption>
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/possibleItemsProcess.js</possibleItemsProcess>
<state>AUTO</state>
</entityField>
<entityIncomingField>
<name>ProductProductprice_dfi</name>
......@@ -120,9 +150,62 @@
</entityParameter>
<entityField>
<name>Pricelist_Relation</name>
<caption>Preisliste / Firma</caption>
<caption>Price list / Company</caption>
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist_relation/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist_relation/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Productprice_entity/entityfields/pricelist_relation/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>PRODUCT_GROUPCODEID</name>
<caption>Product group</caption>
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_groupcodeid/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityIncomingField>
<name>OrgProductprice_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>93263731-7e48-4933-bdea-500a58a53357</name>
<entityName>Org_entity</entityName>
<fieldName>OrgProductprice_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<entityParameter>
<name>RelID_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityIncomingField>
<name>PersProductprice_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>268bacb4-334d-42ba-9685-11e4854f0d85</name>
<entityName>Pers_entity</entityName>
<fieldName>PersPricelist_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>RelID_param</name>
<code>%aditoprj%/entity/Productprice_entity/entityfields/persproductprice_dfi/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityIncomingField>
<entityOutgoingField>
<name>ProductpriceProduct_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Product_entity</entityName>
<fieldName>Product_dfi</fieldName>
</dependency>
</entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
......
entity/Productprice_entity/entityfields/buysell/mandatoryProcess.js 0 → 100644
+ 14
− 0
View file @ bd00341a
import("system.logging");
import("system.vars");
import("system.result");
logging.log("#####ProductId_param:" + vars.get("$param.ProductId_param"));
if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != "")
{
result.string("true");
}
else
{
result.string("false");
}
\ No newline at end of file
entity/Productprice_entity/entityfields/buysell/possibleItemsProcess.js
+ 2
− 2
View file @ bd00341a
......@@ -2,6 +2,6 @@ import("system.translate");
import("system.result");
result.object([
["EK", translate.text("EK")],
["VK", translate.text("VK")]
["PP", translate.text("PP")],
["SP", translate.text("SP")]
]);
\ No newline at end of file
entity/Productprice_entity/entityfields/persproductprice_dfi/children/relid_param/code.js 0 → 100644
+ 4
− 0
View file @ bd00341a
import("system.result");
import("system.vars");
result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
entity/Productprice_entity/entityfields/pricelist_relation/onValueChange.js 0 → 100644
+ 4
− 0
View file @ bd00341a
//import("system.neon");
//import("system.vars");
//
//neon.setFieldValue("$field.PRICELIST", vars.get("$local.value"));
\ No newline at end of file
entity/Productprice_entity/entityfields/pricelist_relation/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ bd00341a
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("PRICELIST");
result.object(items);
\ No newline at end of file
entity/Productprice_entity/entityfields/product_groupcodeid/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ bd00341a
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("GROUPCODE");
result.object(items);
\ No newline at end of file
entity/Productprice_entity/entityfields/product_id/fieldIdProcess.js 0 → 100644
+ 4
− 0
View file @ bd00341a
import("system.vars");
import("system.result");
result.string (vars.get("$this.value"));
\ No newline at end of file
entity/Productprice_entity/entityfields/product_id/valueProcess.js 0 → 100644
+ 10
− 0
View file @ bd00341a
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != null && vars.get("$param.ProductId_param") != "")
result.string(vars.getString("$param.ProductId_param"));
}
entity/Productprice_entity/entityfields/productpriceid/valueProcess.js 0 → 100644
+ 7
− 0
View file @ bd00341a
import("system.util");
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(util.getNewUUID());
\ No newline at end of file
entity/Productprice_entity/entityfields/valid_from/onValidation.js 0 → 100644
+ 9
− 0
View file @ bd00341a
import("system.result");
import("system.vars");
import("Date_lib");
var dateUtils = new DateUtils();
var cStart = vars.get("$local.value");
if (dateUtils.validateBeginnBeforeEnd(cStart, vars.get("$field.VALID_TO")) === false)
result.string(dateUtils.getValidationFailString());
\ No newline at end of file
entity/Productprice_entity/entityfields/valid_to/onValidation.js 0 → 100644
+ 9
− 0
View file @ bd00341a
import("system.result");
import("system.vars");
import("Date_lib");
var dateUtils = new DateUtils();
var cEnd = vars.get("$local.value");
if (dateUtils.validateBeginnBeforeEnd(vars.get("$field.VALID_FROM"), cEnd) === false)
result.string(dateUtils.getValidationFailString());
\ No newline at end of file
entity/Stock_entity/Stock_entity.aod 0 → 100644
+ 114
− 0
View file @ bd00341a
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
<name>Stock_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Stock_entity/conditionProcess.js</conditionProcess>
<recordContainerType>DB</recordContainerType>
<entityFields>
<entityField>
<name>DATE_EDIT</name>
<tableName>STOCK</tableName>
<columnName>DATE_EDIT</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
<valueProcess>%aditoprj%/entity/Stock_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<tableName>STOCK</tableName>
<columnName>DATE_NEW</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
<valueProcess>%aditoprj%/entity/Stock_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ENTRYDATE</name>
<tableName>STOCK</tableName>
<columnName>ENTRYDATE</columnName>
<caption>Date</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<valueProcess>%aditoprj%/entity/Stock_entity/entityfields/entrydate/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>IN_OUT</name>
<tableName>STOCK</tableName>
<columnName>IN_OUT</columnName>
<caption>I / O</caption>
<contentType>TEXT</contentType>
<possibleItemsProcess>%aditoprj%/entity/Stock_entity/entityfields/in_out/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>PRODUCT_ID</name>
<tableName>STOCK</tableName>
<columnName>PRODUCT_ID</columnName>
<valueProcess>%aditoprj%/entity/Stock_entity/entityfields/product_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>QUANTITY</name>
<tableName>STOCK</tableName>
<columnName>QUANTITY</columnName>
<caption>Menge</caption>
<contentType>NUMBER</contentType>
<outputFormat></outputFormat>
</entityField>
<entityField>
<name>REFNUMBER</name>
<tableName>STOCK</tableName>
<columnName>REFNUMBER</columnName>
<caption>Reference</caption>
</entityField>
<entityField>
<name>STOCKID</name>
<tableName>STOCK</tableName>
<columnName>STOCKID</columnName>
<valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<tableName>STOCK</tableName>
<columnName>USER_EDIT</columnName>
<valueProcess>%aditoprj%/entity/Stock_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
<tableName>STOCK</tableName>
<columnName>USER_NEW</columnName>
<valueProcess>%aditoprj%/entity/Stock_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>WAREHOUSE</name>
<tableName>STOCK</tableName>
<columnName>WAREHOUSE</columnName>
<caption>Warehouse</caption>
<possibleItemsProcess>%aditoprj%/entity/Stock_entity/entityfields/warehouse/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityParameter>
<name>ProductId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityIncomingField>
<name>ProductStock_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
<entityName>Product_entity</entityName>
<fieldName>ProductStock_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
</entityFields>
<linkInformation>
<linkInformation>
<name>f8caac29-1e0d-4cf5-9137-fedd6a765d55</name>
<tableName>STOCK</tableName>
<primaryKey>STOCKID</primaryKey>
<isUIDTable v="true" />
</linkInformation>
</linkInformation>
</entity>
entity/Stock_entity/conditionProcess.js 0 → 100644
+ 8
− 0
View file @ bd00341a
import("system.logging");
import("system.result");
import("system.vars");
if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != null)
result.string("STOCK.PRODUCT_ID = ('" + vars.getString("$param.ProductId_param") + "')");
else
result.string("1 = 2");
\ No newline at end of file
entity/Stock_entity/entityfields/date_edit/valueProcess.js 0 → 100644
+ 6
− 0
View file @ bd00341a
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
entity/Stock_entity/entityfields/date_new/valueProcess.js 0 → 100644
+ 6
− 0
View file @ bd00341a
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
entity/Stock_entity/entityfields/entrydate/valueProcess.js 0 → 100644
+ 6
− 0
View file @ bd00341a
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
entity/Stock_entity/entityfields/in_out/possibleItemsProcess.js 0 → 100644
+ 7
− 0
View file @ bd00341a
import("system.result");
import("system.translate");
result.object([
["1", translate.text("IN")],
["-1", translate.text("OUT")]
]);
\ No newline at end of file
entity/Stock_entity/entityfields/product_id/valueProcess.js 0 → 100644
+ 10
− 0
View file @ bd00341a
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != null && vars.get("$param.ProductId_param") != "")
result.string(vars.getString("$param.ProductId_param"));
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment