Skip to content
Snippets Groups Projects
Commit 4adb61a5 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge origin/master

parents 2a5c73d5 87bd1970
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 217 additions and 72 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 43
− 43
View file @ 4adb61a5
......@@ -88,8 +88,8 @@
<name>TYPE</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" />
......@@ -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" />
......@@ -728,8 +728,8 @@
<name>PAYMENT</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" />
......@@ -741,8 +741,8 @@
<name>CONTRACTSTATUS</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" />
......@@ -793,8 +793,8 @@
<name>CONTRACTTYPE</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" />
......@@ -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" />
......@@ -942,8 +942,8 @@
<name>GROUPCODEID</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" />
......@@ -1139,8 +1139,8 @@
<name>CURRENCY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<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" />
......@@ -1554,8 +1554,8 @@
<name>CURRENCY</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" />
......@@ -1658,8 +1658,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" />
......@@ -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" />
......@@ -1914,8 +1914,8 @@
<name>GROUPCODEID</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" />
......@@ -2395,8 +2395,8 @@
<name>GROUPCODE</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" />
......@@ -3041,8 +3041,8 @@
<name>CURRENCY</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" />
......@@ -3382,8 +3382,8 @@
<name>GROUPCODEID</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/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js
+ 2
− 1
View file @ 4adb61a5
import("system.result");
import("Keyword_lib");
result.string("ActivityDirection");
\ No newline at end of file
result.string($KeywordRegistry.get.ActivityDirection);
\ No newline at end of file
entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js
+ 1
− 1
View file @ 4adb61a5
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("ActivityDirection", "ACTIVITY.DIRECTION");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ActivityDirection, "ACTIVITY.DIRECTION");
result.string(sql);
entity/Contact_entity/Contact_entity.aod
+ 20
− 1
View file @ 4adb61a5
......@@ -21,7 +21,7 @@
<entityField>
<name>GENDER</name>
<title>Gender</title>
<possibleItemsProcess>%aditoprj%/entity/Contact_entity/entityfields/gender/possibleItemsProcess.js</possibleItemsProcess>
<consumer>KeywordGenders</consumer>
</entityField>
<entityField>
<name>LASTNAME</name>
......@@ -453,6 +453,21 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordGenders</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Keyword_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Contact_entity/entityfields/keywordgenders/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -559,6 +574,10 @@
<name>ORG_ID.displayValue</name>
<recordfield>ORG.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GENDER.displayValue</name>
<expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Orderitem_entity/entityfields/unit/possibleItemsProcess.js → entity/Contact_entity/entityfields/keywordgenders/children/containername_param/code.js
+ 4
− 0
View file @ 4adb61a5
import("system.result");
import("Keyword_lib");
var items;
items = KeywordUtils.getStandardArray("UNIT");
result.object(items);
\ No newline at end of file
result.string($KeywordRegistry.get.PersonGender);
entity/Contact_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ 4adb61a5
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.PersonGender, "PERS.GENDER");
result.string(sql);
entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js
+ 3
− 1
View file @ 4adb61a5
import("system.result");
result.string("ContractPayment");
\ No newline at end of file
import("Keyword_lib");
result.string($KeywordRegistry.get.ContractPayment);
\ No newline at end of file
entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
+ 3
− 1
View file @ 4adb61a5
import("system.result");
result.string("ContractStatus");
\ No newline at end of file
import("Keyword_lib");
result.string($KeywordRegistry.get.ContractPayment);
\ No newline at end of file
entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js
+ 3
− 1
View file @ 4adb61a5
import("system.result");
result.string("ContractType");
\ No newline at end of file
import("Keyword_lib");
result.string($KeywordRegistry.get.ContractType);
\ No newline at end of file
entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js
+ 1
− 1
View file @ 4adb61a5
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("ContractStatus", "CONTRACT.CONTRACTSTATUS");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractStatus, "CONTRACT.CONTRACTSTATUS");
result.string(sql);
\ No newline at end of file
entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
+ 1
− 1
View file @ 4adb61a5
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACT.CONTRACTTYPE");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractType, "CONTRACT.CONTRACTTYPE");
result.string(sql);
\ No newline at end of file
entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
+ 1
− 1
View file @ 4adb61a5
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("ContractPayment", "CONTRACT.PAYMENT");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractPayment, "CONTRACT.PAYMENT");
result.string(sql);
\ No newline at end of file
entity/Keyword_entity/Keyword_entity.aod
+ 96
− 0
View file @ 4adb61a5
......@@ -118,6 +118,102 @@
<fieldName>KeywordCurrencies</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f5dcbf08-3765-4a9d-8b42-cb1219c87f57</name>
<entityName>Offeritem_entity</entityName>
<fieldName>KeywordProductGroupcodes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>53bcaa07-94eb-4e81-9e9e-c5748156dad5</name>
<entityName>Orderitem_entity</entityName>
<fieldName>KeywordProductGroupcodes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>c404b010-1634-4160-adca-7edf1535ee26</name>
<entityName>Product_entity</entityName>
<fieldName>KeywordProductGroupcodes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>3575fdd7-3dd6-4318-b0d2-32d1df821076</name>
<entityName>SalesprojectForecast_entity</entityName>
<fieldName>KeywordProductGroupcodes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>5a21cbe2-4eb0-4968-80fa-b98a64599230</name>
<entityName>Offer_entity</entityName>
<fieldName>KeywordOfferStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>8696e561-b263-4c7c-b753-c5da44b48055</name>
<entityName>Organisation_entity</entityName>
<fieldName>KeywordOrganisationTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>0d54d283-f158-4b91-8f6d-026954ed9c50</name>
<entityName>Contact_entity</entityName>
<fieldName>KeywordGenders</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>001e0934-0920-4b38-afff-caf299e96abf</name>
<entityName>Task_entity</entityName>
<fieldName>KeywordTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>8d28f08b-675d-4bcf-9318-a508d45ca69e</name>
<entityName>Task_entity</entityName>
<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>
</dependencies>
<children>
<entityParameter>
......
entity/Offer_entity/Offer_entity.aod
+ 20
− 1
View file @ 4adb61a5
......@@ -70,7 +70,7 @@
<entityField>
<name>STATUS</name>
<title>Status</title>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
<consumer>KeywordOfferStates</consumer>
<state>EDITABLE</state>
</entityField>
<entityField>
......@@ -332,6 +332,21 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordOfferStates</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Keyword_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -444,6 +459,10 @@
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
<expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Offer_entity/entityfields/image/valueProcess.js
+ 1
− 1
View file @ 4adb61a5
......@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Keyword_lib");
result.string("TEXT:" + KeywordUtils.getViewValue("OFFER.STATUS", vars.getString("$field.STATUS")) );
\ No newline at end of file
result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.OfferStatus, vars.getString("$field.STATUS")) );
\ No newline at end of file
entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js
+ 3
− 1
View file @ 4adb61a5
import("system.result");
result.string("Currency");
\ No newline at end of file
import("Keyword_lib");
result.string($KeywordRegistry.get.Currency);
\ No newline at end of file
entity/Product_entity/entityfields/unit/possibleItemsProcess.js → entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js
+ 4
− 0
View file @ 4adb61a5
import("system.result");
import("Keyword_lib");
var items;
items = KeywordUtils.getStandardArray("UNIT");
result.object(items);
\ No newline at end of file
result.string($KeywordRegistry.get.OfferStatus);
\ No newline at end of file
entity/Offer_entity/entityfields/status/possibleItemsProcess.js deleted 100644 → 0
+ 0
− 16
View file @ 2a5c73d5
import("system.result");
import("Keyword_lib");
import("system.vars");
import("Offer_lib");
var items = KeywordUtils.getStandardArray("OFFER.STATUS");
if (!OfferUtils.isEditable(vars.get("$field.STATUS")))
{
items = items.filter(function(pItem)
{
return !OfferUtils.isEditable(pItem[0]);
});
}
result.object(items);
\ No newline at end of file
entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+ 1
− 1
View file @ 4adb61a5
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("Currency", "OFFER.CURRENCY");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.Currency, "OFFER.CURRENCY");
result.string(sql);
\ No newline at end of file
entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ 4adb61a5
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.OfferStatus, "OFFER.STATUS");
result.string(sql);
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