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/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/code.js 0 additions, 3 deletions...rdobjectrelationtype/children/containername_param/code.js
- entity/ObjectRelation_entity/entityfields/otherobjectrowid/displayValueProcess.js 0 additions, 7 deletions...tity/entityfields/otherobjectrowid/displayValueProcess.js
- entity/ObjectRelation_entity/entityfields/otherobjectrowid/valueProcess.js 0 additions, 12 deletions...tion_entity/entityfields/otherobjectrowid/valueProcess.js
- entity/ObjectRelation_entity/entityfields/otherobjecttype/displayValueProcess.js 0 additions, 0 deletions...ntity/entityfields/otherobjecttype/displayValueProcess.js
- entity/ObjectRelation_entity/entityfields/otherobjecttype/valueProcess.js 0 additions, 12 deletions...ation_entity/entityfields/otherobjecttype/valueProcess.js
- entity/Offer_entity/Offer_entity.aod 7 additions, 1 deletionentity/Offer_entity/Offer_entity.aod
- entity/Offer_entity/entityfields/header/valueProcess.js 13 additions, 7 deletionsentity/Offer_entity/entityfields/header/valueProcess.js
- entity/Offeritem_entity/Offeritem_entity.aod 11 additions, 2 deletionsentity/Offeritem_entity/Offeritem_entity.aod
- entity/Offeritem_entity/entityfields/info/valueProcess.js 0 additions, 12 deletionsentity/Offeritem_entity/entityfields/info/valueProcess.js
- entity/Offeritem_entity/entityfields/optional/valueProcess.js 1 addition, 1 deletion...ty/Offeritem_entity/entityfields/optional/valueProcess.js
- entity/Offeritem_entity/entityfields/product_id/onValueChange.js 3 additions, 1 deletion...Offeritem_entity/entityfields/product_id/onValueChange.js
- entity/Offeritem_entity/entityfields/unit/displayValueProcess.js 12 additions, 0 deletions...Offeritem_entity/entityfields/unit/displayValueProcess.js
- entity/Order_entity/Order_entity.aod 12 additions, 0 deletionsentity/Order_entity/Order_entity.aod
- entity/Order_entity/entityfields/offer_id/displayValueProcess.js 5 additions, 0 deletions...Order_entity/entityfields/offer_id/displayValueProcess.js
- entity/Order_entity/entityfields/offer_id/valueProcess.js 7 additions, 0 deletionsentity/Order_entity/entityfields/offer_id/valueProcess.js
- entity/Organisation_entity/Organisation_entity.aod 1 addition, 20 deletionsentity/Organisation_entity/Organisation_entity.aod
- entity/Organisation_entity/entityfields/status/valueProcess.js 7 additions, 0 deletions...y/Organisation_entity/entityfields/status/valueProcess.js
- entity/Person_entity/Person_entity.aod 5 additions, 6 deletionsentity/Person_entity/Person_entity.aod
- entity/Product_entity/Product_entity.aod 29 additions, 46 deletionsentity/Product_entity/Product_entity.aod
- entity/Product_entity/entityfields/attributes/children/objectrowid_param/code.js 5 additions, 0 deletions...ntityfields/attributes/children/objectrowid_param/code.js
Loading
Please register or sign in to comment