Skip to content
Snippets Groups Projects
Commit 3c413081 authored by S.Listl's avatar S.Listl
Browse files

Merge origin/master

parents 044630d4 6e9e72a6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 252 additions and 23 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 19
− 19
View file @ 3c413081
......@@ -385,7 +385,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -864,8 +864,8 @@
<name>UNIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -1178,8 +1178,8 @@
<name>PRICELIST</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -1784,8 +1784,8 @@
<name>UNIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -2203,8 +2203,8 @@
<name>SOURCE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -2657,8 +2657,8 @@
<name>SALESPROJECT_ROLE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -3153,8 +3153,8 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -3270,8 +3270,8 @@
<name>UNIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -3569,8 +3569,8 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -3653,8 +3653,8 @@
<name>TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......
entity/Context_entity/Context_entity.aod
+ 1
− 0
View file @ 3c413081
......@@ -44,6 +44,7 @@
<entityParameter>
<name>ContextId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
</children>
......
entity/Context_entity/recordcontainers/jdito/contentProcess.js
+ 0
− 1
View file @ 3c413081
import("system.vars");
import("system.result");
import("system.project");
import("system.logging");
import("Context_lib");
if (vars.exists("$param.ContextId_param") && vars.get("$param.ContextId_param"))
......
entity/Context_entity/titleProcess.js 0 → 100644
+ 4
− 0
View file @ 3c413081
import("system.vars");
import("system.result");
result.string(vars.get("$field.CONTEXT_NAME"))
\ No newline at end of file
entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js
+ 1
− 1
View file @ 3c413081
......@@ -5,4 +5,4 @@ import("Keyword_lib");
var cType = vars.get("$field.CONTRACTTYPE");
var cCode = vars.get("$field.CONTRACTCODE");
result.string(KeywordUtils.getViewValue("CONTRACT.CONTRACTTYPE", cType) + " : " + cCode);
\ No newline at end of file
result.string(KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, cType) + " : " + cCode);
\ No newline at end of file
entity/Contract_entity/entityfields/image/valueProcess.js
+ 1
− 1
View file @ 3c413081
......@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Keyword_lib");
result.string("TEXT:" + KeywordUtils.getViewValue("CONTRACT.CONTRACTTYPE", vars.getString("$field.CONTRACTTYPE")) );
\ No newline at end of file
result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, vars.getString("$field.CONTRACTTYPE")) );
\ No newline at end of file
entity/Keyword_entity/Keyword_entity.aod
+ 54
− 0
View file @ 3c413081
......@@ -172,6 +172,60 @@
<fieldName>KeywordStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b069ef7d-07a0-460c-a8e7-cde5861c96c2</name>
<entityName>Productprice_entity</entityName>
<fieldName>KeywordPricelists</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>7f134ef1-cff5-4cf4-9d2a-e288c7904c28</name>
<entityName>Offeritem_entity</entityName>
<fieldName>KeywordQuantityUnits</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>c3c3b430-a14f-46b4-909a-9b53cef35413</name>
<entityName>Orderitem_entity</entityName>
<fieldName>KeywordQuantityUnits</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>a1983efd-92f9-4a6b-8805-d2977fcde0c8</name>
<entityName>Product_entity</entityName>
<fieldName>KeywordQuantityUnits</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>026021cd-cd64-400d-8bd5-f6d044af1ad8</name>
<entityName>SalesprojectMember_entity</entityName>
<fieldName>KeywordMemberRoles</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
<entityName>SalesprojectSource_entity</entityName>
<fieldName>KeywordSources</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>36a72192-902f-431b-8f43-0bef311678f7</name>
<entityName>Order_entity</entityName>
<fieldName>KeywordStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>59546343-9f48-4437-a829-e7715e860a7d</name>
<entityName>SalesprojectCompetition_entity</entityName>
<fieldName>KeywordWonLost</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>e2041dea-8647-49e9-aacf-4481b75b76ff</name>
<entityName>Stock_entity</entityName>
<fieldName>KeywordWarehouses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/ObjectRelation_entity/ObjectRelation_entity.aod
+ 7
− 1
View file @ 3c413081
......@@ -13,7 +13,7 @@
<name>OBJECT1_TYPE</name>
<title>Type 1</title>
<consumer>Contexts</consumer>
<linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/linkedContextProcess.js</linkedContextProcess>
<linkedContext>Context_context</linkedContext>
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_type/displayValueProcess.js</displayValueProcess>
......@@ -23,6 +23,9 @@
<title>Object 1</title>
<consumer>Objects1</consumer>
<linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/linkedContextProcess.js</linkedContextProcess>
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object1_rowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>AB_OBJECTRELATIONID</name>
......@@ -32,6 +35,8 @@
<title>Object 2</title>
<consumer>Objects2</consumer>
<linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/linkedContextProcess.js</linkedContextProcess>
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OBJECT2_TYPE</name>
......@@ -40,6 +45,7 @@
<linkedContext>Context_context</linkedContext>
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_type/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
<name>Object1Type_param</name>
......
entity/ObjectRelation_entity/entityfields/object1_rowid/displayValueProcess.js 0 → 100644
+ 28
− 0
View file @ 3c413081
import("system.logging");
import("system.neon");
import("system.vars");
import("system.result");
import("system.db");
import("Context_lib");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW)
{
if (vars.exists("$param.AnyObjectRowid_param") && vars.get("$param.AnyObjectRowid_param"))
{
result.string(db.cell(ContextUtils.getNameSql(vars.get("$param.AnyObjectType_param"), vars.get("$param.AnyObjectRowid_param"))));
}
else if (vars.exists("$param.Object1Rowid_param") && vars.get("$param.Object1Rowid_param"))
{
result.string(vars.get("$param.Object1Rowid_param"));
}
}
else if (recordstate == neon.OPERATINGSTATE_EDIT)
{
logging.log("edit")
if (vars.exists("$field.OBJECT1_ROWID") && vars.get("$field.OBJECT1_ROWID") && vars.exists("$field.OBJECT1_TYPE") && vars.get("$field.OBJECT1_TYPE"))
{
logging.log(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT1_TYPE"), vars.get("$field.OBJECT1_ROWID"))))
result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT1_TYPE"), vars.get("$field.OBJECT1_ROWID"))));
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_rowid/stateProcess.js 0 → 100644
+ 14
− 0
View file @ 3c413081
import("system.result");
import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
{
if ((vars.exists("$param.AnyObjectRowid_param") && vars.get("$param.AnyObjectRowid_param"))
|| (vars.exists("$param.Object1Rowid_param") && vars.get("$param.Object1Rowid_param")))
{
result.string(neon.COMPONENTSTATE_READONLY);
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_rowid/valueProcess.js 0 → 100644
+ 16
− 0
View file @ 3c413081
import("system.result");
import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
{
if (vars.exists("$param.AnyObjectRowid_param") && vars.get("$param.AnyObjectRowid_param"))
{
result.string(vars.get("$param.AnyObjectRowid_param"));
}
else if (vars.exists("$param.Object1Rowid_param") && vars.get("$param.Object1Rowid_param"))
{
result.string(vars.get("$param.Object1Rowid_param"));
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_type/displayValueProcess.js 0 → 100644
+ 24
− 0
View file @ 3c413081
import("system.result");
import("system.neon");
import("system.vars");
import("system.project");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW)
{
if (vars.exists("$param.AnyObjectType_param") && vars.get("$param.AnyObjectType_param"))
{
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$param.AnyObjectType_param"))[1]);
}
else if (vars.exists("$param.Object1Type_param") && vars.get("$param.Object1Type_param"))
{
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$param.Object1Type_param"))[1]);
}
}
else
{
if (vars.exists("$field.OBJECT1_TYPE") && vars.get("$field.OBJECT1_TYPE"))
{
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT1_TYPE"))[1]);
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_type/stateProcess.js 0 → 100644
+ 13
− 0
View file @ 3c413081
import("system.result");
import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
{
if ((vars.exists("$param.AnyObjectType_param") && vars.get("$param.AnyObjectType_param"))
|| (vars.exists("$param.Object1Type_param") && vars.get("$param.Object1Type_param")))
{
result.string(neon.COMPONENTSTATE_READONLY);
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object1_type/valueProcess.js 0 → 100644
+ 16
− 0
View file @ 3c413081
import("system.result");
import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW)
{
if (vars.exists("$param.AnyObjectType_param") && vars.get("$param.AnyObjectType_param"))
{
result.string(vars.get("$param.AnyObjectType_param"));
}
else if (vars.exists("$param.Object1Type_param") && vars.get("$param.Object1Type_param"))
{
result.string(vars.get("$param.Object1Type_param"));
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js 0 → 100644
+ 12
− 0
View file @ 3c413081
import("system.logging");
import("system.result");
import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
{
logging.log(vars.exists("$param.Object2Rowid_param") && vars.get("$param.Object2Rowid_param"))
if (vars.exists("$param.Object2Rowid_param") && vars.get("$param.Object2Rowid_param"))
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js 0 → 100644
+ 12
− 0
View file @ 3c413081
import("system.result");
import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
{
if (vars.exists("$param.Object2Rowid_param") && vars.get("$param.Object2Rowid_param"))
{
result.string(vars.get("$param.Object2Rowid_param"));
}
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object2_type/displayValueProcess.js 0 → 100644
+ 8
− 0
View file @ 3c413081
import("system.result");
import("system.vars");
import("system.project");
if (vars.exists("$field.OBJECT2_TYPE") && vars.get("$field.OBJECT2_TYPE"))
{
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT2_TYPE"))[1]);
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object2_type/stateProcess.js 0 → 100644
+ 10
− 0
View file @ 3c413081
import("system.result");
import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW || recordstate == neon.OPERATINGSTATE_EDIT)
{
if (vars.exists("$param.Object2Type_param") && vars.get("$param.Object2Type_param"))
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
entity/ObjectRelation_entity/entityfields/object2_type/valueProcess.js 0 → 100644
+ 12
− 0
View file @ 3c413081
import("system.result");
import("system.neon");
import("system.vars");
var recordstate = vars.get("$sys.recordstate");
if (recordstate == neon.OPERATINGSTATE_NEW)
{
if (vars.exists("$param.Object2Type_param") && vars.get("$param.Object2Type_param"))
{
result.string(vars.get("$param.Object2Type_param"));
}
}
\ 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