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 328 additions and 49 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 171
− 2
View file @ bd00341a
......@@ -1280,7 +1280,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<index v="true" />
<title></title>
<description></description>
</entityFieldDb>
......@@ -1481,7 +1481,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<index v="true" />
<title></title>
<description></description>
</entityFieldDb>
......@@ -1962,6 +1962,175 @@
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
<name>STOCK</name>
<dbName></dbName>
<idColumn>STOCKID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<title></title>
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
<auditMode v="0" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
<entityFieldDb>
<name>REFNUMBER</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>STOCKID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>WAREHOUSE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>ENTRYDATE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
<title></title>
<description></description>
<dependencies>
<entityDependency>
<name>1d99d9fe-4956-4fd4-9f67-32b1c731dcc1</name>
<entityName>PRODUCT</entityName>
<fieldName>PRODUCTID</fieldName>
</entityDependency>
</dependencies>
</entityFieldDb>
<entityFieldDb>
<name>IN_OUT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities>
</entityGroup>
</aliasDefDb>
......
entity/Contract_entity/Contract_entity.aod
+ 11
− 9
View file @ bd00341a
......@@ -12,13 +12,14 @@
<name>CONTRACTCODE</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTCODE</columnName>
<caption>Vertragsnummer</caption>
<caption>Contract number</caption>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/onValidation.js</onValidation>
</entityField>
<entityField>
<name>CONTRACTDUE</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTDUE</columnName>
<caption>nächste Fälligkeit</caption>
<caption>Next due date</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractdue/onValidation.js</onValidation>
......@@ -27,7 +28,7 @@
<name>CONTRACTEND</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTEND</columnName>
<caption>Vertragsende</caption>
<caption>Contract expiry date</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValidation.js</onValidation>
......@@ -37,12 +38,13 @@
<name>CONTRACTID</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTID</columnName>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>CONTRACTSTART</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTSTART</columnName>
<caption>Vertragsbeginn</caption>
<caption>Contract start date</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValidation.js</onValidation>
......@@ -51,14 +53,14 @@
<name>CONTRACTSTATUS</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTSTATUS</columnName>
<caption>Status</caption>
<caption>${CONTRACT_STATUS}</caption>
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstatus/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>CONTRACTTYPE</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTTYPE</columnName>
<caption>Vertragsart</caption>
<caption>Type of contract</caption>
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
......@@ -81,7 +83,7 @@
<name>PAYMENT</name>
<tableName>CONTRACT</tableName>
<columnName>PAYMENT</columnName>
<caption>Zahlweise</caption>
<caption>Payment method</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/payment/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
......@@ -89,7 +91,7 @@
<name>RELATION_ID</name>
<tableName>CONTRACT</tableName>
<columnName>RELATION_ID</columnName>
<caption>Person / Firma</caption>
<caption>Contact / Company</caption>
<linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<outgoingField>ContractOrg_dfo</outgoingField>
......@@ -101,7 +103,7 @@
<name>REMARK</name>
<tableName>CONTRACT</tableName>
<columnName>REMARK</columnName>
<caption>Beschreibung</caption>
<caption>Description</caption>
<contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
......
entity/Contract_entity/conditionProcess.js
+ 2
− 2
View file @ bd00341a
import("system.result");
import("system.vars");
if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null)
if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null && vars.get("$param.RelId_param") != "")
result.string("CONTRACT.RELATION_ID = ('" + vars.getString("$param.RelId_param") + "')");
else
result.string("");
\ No newline at end of file
result.string("1 = 1");
\ No newline at end of file
entity/Contract_entity/entityfields/contractcode/onValidation.js 0 → 100644
+ 11
− 0
View file @ bd00341a
import("system.translate");
import("system.result");
import("system.vars");
import("system.db");
var codeCount = db.cell("select count(CONTRACTCODE) from CONTRACT where CONTRACTCODE = '" + vars.get("$local.value") + "'"
+ " and CONTRACTID <> '" + vars.get("$field.CONTRACTID") + "'");
if(codeCount > 0)
{
result.string(translate.text("The contract number already exists!"));
}
\ No newline at end of file
entity/Contract_entity/entityfields/contractdue/onValidation.js
+ 1
− 1
View file @ bd00341a
......@@ -7,5 +7,5 @@ var dateUtils = new DateUtils();
var cDue = vars.get("$local.value");
if (dateUtils.validateBeginnBeforeEnd(vars.get("$field.CONTRACTSTART"), cDue) === false || dateUtils.validateBeginnBeforeEnd(cDue, vars.get("$field.CONTRACTEND")) === false) {
result.string(translate.text("Nächste Fälligkeit muss nach Vertragsbeginn und vor Vertragsende liegen!"));
result.string(translate.text("The next due date must be after the start of the contract and before the expiry of the contract!"));
}
entity/Contract_entity/entityfields/contractend/onValidation.js
+ 1
− 5
View file @ bd00341a
import("system.logging");
import("system.neon");
import("system.result");
import("system.translate");
import("system.vars");
import("Date_lib");
logging.log("###END_onValidation");
var dateUtils = new DateUtils();
var cEnd = vars.get("$local.value");
var cDue = vars.get("$field.CONTRACTDUE");
......@@ -15,4 +11,4 @@ if (cDue > cEnd && cDue != "")
neon.setFieldValue("$field.CONTRACTDUE", cEnd);
if (dateUtils.validateBeginnBeforeEnd(vars.get("$field.CONTRACTSTART"), cEnd) === false)
result.string(translate.text("Das Ende-Datum muss nach dem Beginn-Datum liegen"));
\ No newline at end of file
result.string(dateUtils.getValidationFailString());
\ No newline at end of file
entity/Contract_entity/entityfields/contractid/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/Contract_entity/entityfields/contractstart/onValidation.js
+ 1
− 5
View file @ bd00341a
import("system.logging");
import("system.neon");
import("system.result");
import("system.translate");
import("system.vars");
import("Date_lib");
logging.log("###START_validation");
var dateUtils = new DateUtils();
var cStart = vars.get("$local.value");
var cDue = vars.get("$field.CONTRACTDUE");
......@@ -15,4 +11,4 @@ if (cDue < cStart && cDue != "")
neon.setFieldValue("$field.CONTRACTDUE", cStart);
if (dateUtils.validateBeginnBeforeEnd(cStart, vars.get("$field.CONTRACTEND")) === false)
result.string(translate.text("Das Ende-Datum muss nach dem Beginn-Datum liegen"));
\ No newline at end of file
result.string(dateUtils.getValidationFailString());
\ No newline at end of file
entity/Contract_entity/entityfields/relation_id/fieldIdProcess.js
+ 0
− 2
View file @ bd00341a
import("system.vars");
import("system.db");
import("system.result");
import("system.neon");
result.string (vars.get("$this.value"));
\ No newline at end of file
entity/Org_entity/Org_entity.aod
+ 17
− 0
View file @ bd00341a
......@@ -281,6 +281,23 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityOutgoingField>
<name>OrgProductprice_dfo</name>
<title>Conditions</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<caption>Conditions</caption>
<dependency>
<name>dependency</name>
<entityName>Productprice_entity</entityName>
<fieldName>OrgProductprice_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>RelID_param</name>
<code>%aditoprj%/entity/Org_entity/entityfields/orgproductprice_dfo/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
......
entity/Org_entity/entityfields/orgproductprice_dfo/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/Pers_entity/Pers_entity.aod
+ 19
− 0
View file @ bd00341a
......@@ -359,6 +359,25 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityOutgoingField>
<name>PersPricelist_dfo</name>
<title>Conditions</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<caption>Conditions</caption>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Productprice_entity</entityName>
<fieldName>PersProductprice_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>RelID_param</name>
<code>%aditoprj%/entity/Pers_entity/entityfields/perspricelist_dfo/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
......
entity/Pers_entity/entityfields/perspricelist_dfo/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/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js 0 → 100644
+ 14
− 0
View file @ bd00341a
import("system.logging");
import("system.vars");
import("system.result");
var org_id = vars.get("$field.ORG_ID").trim();
if(org_id == "0")
{
result.string("EDITABLE");
}
else
{
result.string("INVISIBLE");
}
\ No newline at end of file
entity/Product_entity/Product_entity.aod
+ 43
− 11
View file @ bd00341a
......@@ -11,7 +11,7 @@
<name>ADVERTISING</name>
<tableName>PRODUCT</tableName>
<columnName>ADVERTISING</columnName>
<caption>Werbemittel</caption>
<caption>Advertising material</caption>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/advertising/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/advertising/valueProcess.js</valueProcess>
......@@ -36,7 +36,7 @@
<name>GROUPCODEID</name>
<tableName>PRODUCT</tableName>
<columnName>GROUPCODEID</columnName>
<caption>Produktgruppe</caption>
<caption>Product group</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/groupcodeid/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
......@@ -44,7 +44,7 @@
<name>MINSTOCK</name>
<tableName>PRODUCT</tableName>
<columnName>MINSTOCK</columnName>
<caption>Min.-Bestand</caption>
<caption>Min. stock</caption>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.##</outputFormat>
</entityField>
......@@ -52,14 +52,14 @@
<name>ORG_ID</name>
<tableName>PRODUCT</tableName>
<columnName>ORG_ID</columnName>
<caption>Hersteller</caption>
<caption>Developer</caption>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/org_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PRODUCTCODE</name>
<tableName>PRODUCT</tableName>
<columnName>PRODUCTCODE</columnName>
<caption>Produkt-Nr.</caption>
<caption>Product no.</caption>
<mandatory v="true" />
<onValidation>%aditoprj%/entity/Product_entity/entityfields/productcode/onValidation.js</onValidation>
</entityField>
......@@ -67,12 +67,13 @@
<name>PRODUCTID</name>
<tableName>PRODUCT</tableName>
<columnName>PRODUCTID</columnName>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/productid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PRODUCTNAME</name>
<tableName>PRODUCT</tableName>
<columnName>PRODUCTNAME</columnName>
<caption>Produktname</caption>
<caption>Product name</caption>
<mandatory v="true" />
</entityField>
<entityField>
......@@ -84,7 +85,7 @@
<name>STATUS</name>
<tableName>PRODUCT</tableName>
<columnName>STATUS</columnName>
<caption>Aktiv</caption>
<caption>Active</caption>
<contentType>BOOLEAN</contentType>
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/status/valueProcess.js</valueProcess>
......@@ -93,7 +94,7 @@
<name>UNIT</name>
<tableName>PRODUCT</tableName>
<columnName>UNIT</columnName>
<caption>Einheit</caption>
<caption>Unit</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/unit/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
......@@ -132,7 +133,7 @@
</entityIncomingField>
<entityField>
<name>STOCKCOUNT</name>
<caption>Lagerbestand</caption>
<caption>Stock</caption>
</entityField>
<entityParameter>
<name>OrgId_param</name>
......@@ -143,15 +144,17 @@
</entityParameter>
<entityField>
<name>currentPurchasePrice</name>
<caption>akt. EK-Preis</caption>
<caption>Curr. purchase price</caption>
</entityField>
<entityField>
<name>currentSalesPrice</name>
<caption>akt. VK-Preis</caption>
<caption>Curr. sales price</caption>
</entityField>
<entityOutgoingField>
<name>ProductProductprice_dfo</name>
<title>Price list</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<caption>Price list</caption>
<dependency>
<name>dependency</name>
<entityName>Productprice_entity</entityName>
......@@ -164,6 +167,35 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityIncomingField>
<name>Product_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>15dd9e6b-f551-452f-adce-53d7031ed468</name>
<entityName>Productprice_entity</entityName>
<fieldName>ProductpriceProduct_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<entityOutgoingField>
<name>ProductStock_dfo</name>
<title>Stock</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<caption>Stock</caption>
<dependency>
<name>dependency</name>
<entityName>Stock_entity</entityName>
<fieldName>ProductStock_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<code>%aditoprj%/entity/Product_entity/entityfields/productstock_dfo/children/productid_param/code.js</code>
</entityParameter>
</children>
</entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
......
entity/Product_entity/entityfields/advertising/possibleItemsProcess.js
+ 2
− 2
View file @ bd00341a
......@@ -2,6 +2,6 @@ import("system.translate");
import("system.result");
result.object([
["Y", translate.text("Ja")]
,["N", translate.text("Nein")]
["Y", translate.text("Yes")]
,["N", translate.text("No")]
]);
\ No newline at end of file
entity/Product_entity/entityfields/productcode/onValidation.js
+ 7
− 8
View file @ bd00341a
import("system.db");
import("system.vars");
import("system.swing");
import("system.result");
import("system.translate");
import("system.result");
import("system.vars");
import("system.db");
//Productcode has to be unique
if(db.cell("select count(PRODUCTID) from PRODUCT where PRODUCTCODE = '" + vars.get("$local.value")
+ "' and PRODUCTID != '" + vars.get("$field.PRODUCTID") + "'") != 0)
var codeCount = db.cell("select count(PRODUCTCODE) from PRODUCT where PRODUCTCODE = '" + vars.get("$local.value") + "'"
+ " and PRODUCTID <> '" + vars.get("$field.PRODUCTID") + "'");
if(codeCount > 0)
{
result.string( translate.text("Die Produktnummer exisitiert bereits!") );
result.string(translate.text("The product number already exists!"));
}
\ No newline at end of file
entity/Product_entity/entityfields/productid/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/Product_entity/entityfields/productstock_dfo/children/productid_param/code.js 0 → 100644
+ 4
− 0
View file @ bd00341a
import("system.vars");
import("system.result");
result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
entity/Product_entity/entityfields/status/possibleItemsProcess.js
+ 2
− 2
View file @ bd00341a
......@@ -2,6 +2,6 @@ import("system.translate");
import("system.result");
result.object([
["1", translate.text("Ja")]
,["2", translate.text("Nein")]
["1", translate.text("Yes")]
,["2", translate.text("No")]
]);
\ No newline at end of file
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