Merge origin/master into #1035025_SALUTATION
Conflicts: entity/Person_entity/Person_entity.aod entity/Person_entity/entityfields/salutation/possibleItemsProcess.js others/db_changes/masterChangelog.xml
No related branches found
No related tags found
Showing
- application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod 10 additions, 17 deletions...ation/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
- entity/AttributeRelation_entity/AttributeRelation_entity.aod 6 additions, 0 deletionsentity/AttributeRelation_entity/AttributeRelation_entity.aod
- entity/Communication_entity/entityfields/communicationid/valueProcess.js 7 additions, 0 deletions...ation_entity/entityfields/communicationid/valueProcess.js
- entity/KeywordAttribute_entity/KeywordAttribute_entity.aod 1 addition, 0 deletionsentity/KeywordAttribute_entity/KeywordAttribute_entity.aod
- entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js 5 additions, 0 deletions...KeywordAttribute_entity/recordcontainers/db/onDBDelete.js
- entity/KeywordEntry_entity/KeywordEntry_entity.aod 6 additions, 1 deletionentity/KeywordEntry_entity/KeywordEntry_entity.aod
- entity/KeywordEntry_entity/entityfields/container/documentation.adoc 2 additions, 1 deletion...ordEntry_entity/entityfields/container/documentation.adoc
- entity/KeywordEntry_entity/entityfields/container/stateProcess.js 19 additions, 0 deletions...eywordEntry_entity/entityfields/container/stateProcess.js
- entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc 7 additions, 0 deletions...KeywordEntry_entity/entityfields/keyid/documentation.adoc
- entity/KeywordEntry_entity/entityfields/keyid/onValidation.js 26 additions, 0 deletions...ty/KeywordEntry_entity/entityfields/keyid/onValidation.js
- entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js 1 addition, 1 deletion...ty/KeywordEntry_entity/entityfields/keyid/valueProcess.js
- entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js 5 additions, 0 deletionsentity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js
- entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js 0 additions, 29 deletionsentity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js
- entity/ObjectRelation_entity/ObjectRelation_entity.aod 20 additions, 2 deletionsentity/ObjectRelation_entity/ObjectRelation_entity.aod
- entity/ObjectRelation_entity/entityfields/object2_rowid/displayValueProcess.js 14 additions, 0 deletions..._entity/entityfields/object2_rowid/displayValueProcess.js
- entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js 5 additions, 0 deletions...elation_entity/entityfields/object2_rowid/titleProcess.js
- entity/Organisation_entity/Organisation_entity.aod 53 additions, 2 deletionsentity/Organisation_entity/Organisation_entity.aod
- entity/Organisation_entity/entityfields/newtask/onActionProcess.js 8 additions, 0 deletions...ganisation_entity/entityfields/newtask/onActionProcess.js
- entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js 3 additions, 0 deletions...tityfields/salesprojects/children/contactid_param/code.js
- entity/Organisation_entity/entityfields/taskobjectrelations/children/object1rowid_param/code.js 4 additions, 0 deletions...s/taskobjectrelations/children/object1rowid_param/code.js
Loading