Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

basic
- Activity
- Members
- Releases
- Model registry
- Contributor analytics
- Model experiments

Snippets Groups Projects

04708ff5

Commit 04708ff5 authored 3 years ago by Sebastian Pongratz

Downloads
- Plain Diff

Merge branch 'sales_2001809_2001802' into '2021.2'

[Projekt: xRM-Sales][TicketNr.: 2001809][TicketNr.: 2001802]

See merge request xrm/basic!1460

parents 7d2a8adc 44443eca

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

aliasDefinition/Data_alias/Data_alias.aod 89 additions, 10 deletions

aliasDefinition/Data_alias/Data_alias.aod
aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertisingitem/entityfields/product_id/customproperties/translate4log/property.js 11 additions, 0 deletions

...lds/product_id/customproperties/translate4log/property.js
entity/AdvertisingItem_entity/AdvertisingItem_entity.aod 17 additions, 1 deletion

entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
entity/AdvertisingItem_entity/entityfields/advertising_id/stateProcess.js 8 additions, 0 deletions

...ngItem_entity/entityfields/advertising_id/stateProcess.js
entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/advertising_id.displayvalue/expression.js 13 additions, 0 deletions

...rdfieldmappings/advertising_id.displayvalue/expression.js
entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js 0 additions, 1 deletion

...ogHistory_entity/recordcontainers/jdito/contentProcess.js
neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod 4 additions, 0 deletions

...AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
neonView/AdvertisingTestEdit_view/AdvertisingTestEdit_view.aod 0 additions, 28 deletions

...iew/AdvertisingTestEdit_view/AdvertisingTestEdit_view.aod

with 142 additions and 40 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment