Merge commit '24e7de4a' into #1035025_SALUTATION
# Conflicts: # entity/Address_entity/Address_entity.aod # entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js # entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js # entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js # entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js # entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js # entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js # entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js # entity/Person_entity/Person_entity.aod # entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
No related branches found
No related tags found
Showing
- aliasDefinition/Data_alias/Data_alias.aod 4 additions, 18 deletionsaliasDefinition/Data_alias/Data_alias.aod
- entity/Activity_entity/Activity_entity.aod 7 additions, 6 deletionsentity/Activity_entity/Activity_entity.aod
- entity/AddressType_entity/AddressType_entity.aod 77 additions, 0 deletionsentity/AddressType_entity/AddressType_entity.aod
- entity/AddressType_entity/recordcontainers/db/conditionProcess.js 25 additions, 0 deletions...ddressType_entity/recordcontainers/db/conditionProcess.js
- entity/AddressType_entity/titleProcess.js 5 additions, 0 deletionsentity/AddressType_entity/titleProcess.js
- entity/Address_entity/Address_entity.aod 8 additions, 10 deletionsentity/Address_entity/Address_entity.aod
- entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js 0 additions, 2 deletions...ntactaddresses/children/contacttype_param/valueProcess.js
- entity/Address_entity/entityfields/country/valueProcess.js 9 additions, 0 deletionsentity/Address_entity/entityfields/country/valueProcess.js
- entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js 0 additions, 5 deletions...daddresstype/children/containername_param/valueProcess.js
- entity/Address_entity/entityfields/keywordaddresstype/children/usagefilter_param/valueProcess.js 20 additions, 0 deletions...ordaddresstype/children/usagefilter_param/valueProcess.js
- entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js 0 additions, 3 deletions...essesbycontact/children/contacttype_param/valueProcess.js
- entity/AnyContact_entity/AnyContact_entity.aod 31 additions, 4 deletionsentity/AnyContact_entity/AnyContact_entity.aod
- entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js 8 additions, 0 deletions...act_entity/entityfields/address_id/displayValueProcess.js
- entity/AnyContact_entity/entityfields/contacttype/valueProcess.js 1 addition, 1 deletion...nyContact_entity/entityfields/contacttype/valueProcess.js
- entity/AnyContact_entity/entityfields/image/valueProcess.js 1 addition, 1 deletionentity/AnyContact_entity/entityfields/image/valueProcess.js
- entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js 14 additions, 0 deletions...tact_entity/entityfields/person_full_name/valueProcess.js
- entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js 1 addition, 1 deletion...nyContact_entity/recordcontainers/db/fromClauseProcess.js
- entity/AnyContact_entity/titleProcess.js 12 additions, 5 deletionsentity/AnyContact_entity/titleProcess.js
- entity/Appointment_entity/Appointment_entity.aod 9 additions, 0 deletionsentity/Appointment_entity/Appointment_entity.aod
- entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js 0 additions, 6 deletions...intmentlinks/children/appointmentid_param/valueProcess.js
Loading
Please register or sign in to comment