Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

7b33b490

Commit 7b33b490 authored 6 years ago by Johannes Hörmann

Downloads
- Plain Diff

Merge master into #1034996-objectRelation

Conflicts:
	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
	language/_____LANGUAGE_en/_____LANGUAGE_en.aod

parents de695684 ac884b78

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

entity/KeywordEntry_entity/KeywordEntry_entity.aod 0 additions, 6 deletions

entity/KeywordEntry_entity/KeywordEntry_entity.aod
entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js 2 additions, 1 deletion

...rice_entity/entityfields/pricelist/displayValueProcess.js
entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod 1 addition, 1 deletion

...jectCompetition_entity/SalesprojectCompetition_entity.aod
entity/SalesprojectMember_entity/SalesprojectMember_entity.aod 0 additions, 2 deletions

...y/SalesprojectMember_entity/SalesprojectMember_entity.aod
entity/Salesproject_entity/Salesproject_entity.aod 0 additions, 23 deletions

entity/Salesproject_entity/Salesproject_entity.aod
entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js 0 additions, 5 deletions

...ds/keywordestimation/children/containername_param/code.js
entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js 0 additions, 6 deletions

...recordfieldmappings/estimation.displayvalue/expression.js
entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js 0 additions, 6 deletions

...dfieldmappings/estimationvalue.displayvalue/expression.js
language/_____LANGUAGE_de/_____LANGUAGE_de.aod 3 additions, 0 deletions

language/_____LANGUAGE_de/_____LANGUAGE_de.aod
process/KeywordRegistry_basic/process.js 1 addition, 2 deletions

process/KeywordRegistry_basic/process.js

with 7 additions and 52 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