Skip to content
Snippets Groups Projects
Commit ab777e09 authored by Maximilian Schröger's avatar Maximilian Schröger
Browse files

Merge branch 'master' of gitlab.adito.de:xrm/basic 

# Conflicts:
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
parents 4227ae7f b660b913
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 854 additions and 785 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 2
− 2
View file @ ab777e09
......@@ -130,7 +130,7 @@
<columnType v="12" />
<size v="255" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
......@@ -435,7 +435,7 @@
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
......
entity/Address_entity/Address_entity.aod
+ 29
− 1
View file @ ab777e09
......@@ -5,6 +5,8 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Address_entity/conditionProcess.js</conditionProcess>
<grantCreateProcess>%aditoprj%/entity/Address_entity/grantCreateProcess.js</grantCreateProcess>
<grantDeleteProcess>%aditoprj%/entity/Address_entity/grantDeleteProcess.js</grantDeleteProcess>
<recordContainerType>DB</recordContainerType>
<caption>Addresses</caption>
<entityFields>
......@@ -13,11 +15,13 @@
<tableName>ADDRESS</tableName>
<columnName>ADDRESS</columnName>
<caption>Address</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>ADDRESSADDITION</name>
<tableName>ADDRESS</tableName>
<columnName>ADDRESSADDITION</columnName>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/addressaddition/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>ADDRESSID</name>
......@@ -28,6 +32,7 @@
<name>ADDRIDENTIFIER</name>
<tableName>ADDRESS</tableName>
<columnName>ADDRIDENTIFIER</columnName>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/addridentifier/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>ADDR_TYPE</name>
......@@ -35,18 +40,21 @@
<columnName>ADDR_TYPE</columnName>
<caption>Addresstype</caption>
<possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js</possibleItemsProcess>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>BUILDINGNO</name>
<tableName>ADDRESS</tableName>
<columnName>BUILDINGNO</columnName>
<caption>House number</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/buildingno/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>CITY</name>
<tableName>ADDRESS</tableName>
<columnName>CITY</columnName>
<caption>City</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/city/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>COUNTRY</name>
......@@ -54,6 +62,7 @@
<columnName>COUNTRY</columnName>
<caption>Country</caption>
<possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/country/possibleItemsProcess.js</possibleItemsProcess>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/country/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess>
</entityField>
<entityField>
......@@ -73,12 +82,14 @@
<tableName>ADDRESS</tableName>
<columnName>DISTRICT</columnName>
<caption>District</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/district/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>REGION</name>
<tableName>ADDRESS</tableName>
<columnName>REGION</columnName>
<caption>Region</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/region/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>RELATION_ID</name>
......@@ -91,6 +102,7 @@
<tableName>ADDRESS</tableName>
<columnName>STATE</columnName>
<caption>State</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/state/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
......@@ -109,6 +121,7 @@
<tableName>ADDRESS</tableName>
<columnName>ZIP</columnName>
<caption>postcode</caption>
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/zip/stateProcess.js</stateProcess>
</entityField>
<entityIncomingField>
<name>OrgAddress_dfi</name>
......@@ -148,7 +161,7 @@
<entityParameter>
<name>StandardAddressId_param</name>
<expose v="true" />
<description>PARAMETER</description>
<description>TODO: add description</description>
</entityParameter>
<entityField>
<name>IS_STANDARD</name>
......@@ -164,6 +177,21 @@
<entityIncomingField>
<name>#INCOMING</name>
</entityIncomingField>
<entityParameter>
<name>AddressLineFieldsState_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/addresslinefieldsstate_param/code.js</code>
<expose v="false" />
<mandatory v="false" />
<description>Specifies the FieldState of all AddressLine-Fields (e.g. ZIP, COUNTRY, etc.)
This is needed because you want to modify the record itself for setting the standard address but no other content.</description>
</entityParameter>
<entityParameter>
<name>AllowModifyingCoreData_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/allowmodifyingcoredata_param/code.js</code>
<expose v="true" />
<description>Specified if it&amp;apos;s allowed to modify the address core data.
If this is &amp;quot;false&amp;quot;, you cannot create od delete records or change the actual address-data, e.g. zip-code, address, buildingno, etc.</description>
</entityParameter>
</entityFields>
<linkInformation>
<linkInformation>
......
entity/Address_entity/entityfields/addr_type/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/entityfields/address/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/entityfields/addressaddition/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/entityfields/addresslinefieldsstate_param/code.js 0 → 100644
+ 8
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
import("system.neon");
var allowModify, state;
if (vars.getString("$param.AllowModifyingCoreData_param") == "false")
state = neon.COMPONENTSTATE_READONLY;
result.string(state);
\ No newline at end of file
entity/Address_entity/entityfields/addridentifier/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/entityfields/allowmodifyingcoredata_param/code.js 0 → 100644
+ 2
− 0
View file @ ab777e09
import("system.result");
result.string(true);
\ No newline at end of file
entity/Address_entity/entityfields/buildingno/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/entityfields/city/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/entityfields/country/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/entityfields/district/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/entityfields/region/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/entityfields/state/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/entityfields/zip/stateProcess.js 0 → 100644
+ 3
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
result.string(vars.get("$param.AddressLineFieldsState_param"));
\ No newline at end of file
entity/Address_entity/grantCreateProcess.js 0 → 100644
+ 5
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
import("system.neon");
result.string(vars.get("$param.AllowModifyingCoreData_param"));
\ No newline at end of file
entity/Address_entity/grantDeleteProcess.js 0 → 100644
+ 5
− 0
View file @ ab777e09
import("system.vars");
import("system.result");
import("system.neon");
result.string(vars.get("$param.AllowModifyingCoreData_param"));
\ No newline at end of file
entity/Pers_entity/Pers_entity.aod
+ 4
− 0
View file @ ab777e09
......@@ -271,6 +271,10 @@
<code>%aditoprj%/entity/Pers_entity/entityfields/orgaddress_dfo/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>AllowModifyingCoreData_param</name>
<code>%aditoprj%/entity/Pers_entity/entityfields/orgaddress_dfo/children/allowmodifyingcoredata_param/code.js</code>
</entityParameter>
</children>
</entityOutgoingField>
<entityOutgoingField>
......
entity/Pers_entity/entityfields/orgaddress_dfo/children/allowmodifyingcoredata_param/code.js 0 → 100644
+ 2
− 0
View file @ ab777e09
import("system.result");
result.string(false);
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 764
− 782
View file @ ab777e09
This diff is collapsed.
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