Merge branch 'master' of gitlab.adito.de:xrm/basic into Fix_1035784
# Conflicts: # entity/Document_entity/Document_entity.aod # language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod # language/_____LANGUAGE_de/_____LANGUAGE_de.aod # language/_____LANGUAGE_en/_____LANGUAGE_en.aod
No related branches found
No related tags found
Showing
- entity/Product_entity/entityfields/attributes/children/objecttype_param/code.js 4 additions, 0 deletions...entityfields/attributes/children/objecttype_param/code.js
- entity/Product_entity/entityfields/contact_id/displayValueProcess.js 4 additions, 4 deletions...uct_entity/entityfields/contact_id/displayValueProcess.js
- entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js 9 additions, 0 deletions..._entity/entityfields/currentpurchaseprice/valueProcess.js
- entity/Product_entity/entityfields/currentsalesprice/valueProcess.js 9 additions, 0 deletions...uct_entity/entityfields/currentsalesprice/valueProcess.js
- entity/Productprice_entity/Productprice_entity.aod 4 additions, 4 deletionsentity/Productprice_entity/Productprice_entity.aod
- entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod 24 additions, 39 deletions...jectCompetition_entity/SalesprojectCompetition_entity.aod
- entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/code.js 7 additions, 0 deletions...ds/attributes/children/filteredattributeids_param/code.js
- entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/code.js 4 additions, 0 deletions...ntityfields/attributes/children/objectrowid_param/code.js
- entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/code.js 3 additions, 0 deletions...entityfields/attributes/children/objecttype_param/code.js
- entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js 0 additions, 6 deletions...eldmappings/org_price_politics.displayvalue/expression.js
- entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js 0 additions, 6 deletions...cordfieldmappings/org_strength.displayvalue/expression.js
- entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js 0 additions, 6 deletions...cordfieldmappings/org_weakness.displayvalue/expression.js
- entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod 0 additions, 8 deletions...lesprojectForecast_entity/SalesprojectForecast_entity.aod
- entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js 1 addition, 1 deletion...rojectForecast_entity/entityfields/volume/titleProcess.js
- entity/SalesprojectMember_entity/SalesprojectMember_entity.aod 5 additions, 0 deletions...y/SalesprojectMember_entity/SalesprojectMember_entity.aod
- entity/Salesproject_entity/Salesproject_entity.aod 2 additions, 5 deletionsentity/Salesproject_entity/Salesproject_entity.aod
- entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js 0 additions, 13 deletions...sproject_entity/entityfields/volume/contentTypeProcess.js
- entity/Salesproject_entity/entityfields/volume/displayValueProcess.js 6 additions, 0 deletions...project_entity/entityfields/volume/displayValueProcess.js
- entity/Salesproject_entity/entityfields/volume/onValidation.js 15 additions, 0 deletions...y/Salesproject_entity/entityfields/volume/onValidation.js
- entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js 0 additions, 6 deletions.../db/recordfieldmappings/volume.displayvalue/expression.js
Loading
Please register or sign in to comment