Merge origin/master
Conflicts: entity/Pers_entity/Pers_entity.aod preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- aliasDefinition/Data_alias/Data_alias.aod 2 additions, 0 deletionsaliasDefinition/Data_alias/Data_alias.aod
- aliasDefinition/Data_alias/indexsearchgroups/org/query.js 7 additions, 3 deletionsaliasDefinition/Data_alias/indexsearchgroups/org/query.js
- aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js 3 additions, 0 deletions...Definition/Data_alias/indexsearchgroups/org/subQueries.js
- aliasDefinition/Data_alias/indexsearchgroups/pers/query.js 5 additions, 2 deletionsaliasDefinition/Data_alias/indexsearchgroups/pers/query.js
- aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js 3 additions, 0 deletions...efinition/Data_alias/indexsearchgroups/pers/subQueries.js
- application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod 1 addition, 0 deletions..._SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
- entity/Address_entity/Address_entity.aod 21 additions, 0 deletionsentity/Address_entity/Address_entity.aod
- entity/Address_entity/entityfields/is_standard/onValueChange.js 8 additions, 0 deletions.../Address_entity/entityfields/is_standard/onValueChange.js
- entity/Address_entity/entityfields/is_standard/possibleItemsProcess.js 7 additions, 0 deletions...s_entity/entityfields/is_standard/possibleItemsProcess.js
- entity/Address_entity/entityfields/is_standard/valueProcess.js 10 additions, 0 deletions...y/Address_entity/entityfields/is_standard/valueProcess.js
- entity/Comm_entity/Comm_entity.aod 6 additions, 0 deletionsentity/Comm_entity/Comm_entity.aod
- entity/Comm_entity/entityfields/is_standard/valueProcess.js 4 additions, 0 deletionsentity/Comm_entity/entityfields/is_standard/valueProcess.js
- entity/Comm_entity/orderClauseProcess.js 4 additions, 0 deletionsentity/Comm_entity/orderClauseProcess.js
- entity/History_entity/conditionProcess.js 1 addition, 1 deletionentity/History_entity/conditionProcess.js
- entity/Org_entity/Org_entity.aod 13 additions, 0 deletionsentity/Org_entity/Org_entity.aod
- entity/Org_entity/entityfields/orgaddress_dfo/children/standardaddressid_param/code.js 5 additions, 0 deletions...s/orgaddress_dfo/children/standardaddressid_param/code.js
- entity/Pers_entity/Pers_entity.aod 44 additions, 9 deletionsentity/Pers_entity/Pers_entity.aod
- entity/Pers_entity/conditionProcess.js 1 addition, 1 deletionentity/Pers_entity/conditionProcess.js
- entity/Pers_entity/entityfields/orgaddress_dfo/children/relid_param/code.js 16 additions, 0 deletions.../entityfields/orgaddress_dfo/children/relid_param/code.js
Loading
Please register or sign in to comment