diff options
Diffstat (limited to 'addons/web/static/src/js/views/basic/basic_model.js')
| -rw-r--r-- | addons/web/static/src/js/views/basic/basic_model.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js index a79fabd48d6..6aa884bbacf 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -3423,12 +3423,20 @@ var BasicModel = AbstractModel.extend({ evalContext.parent = this._getRecordEvalContext(parent, forDomain); } } + // Uses "current_company_id" because "company_id" would conflict with all the company_id fields + // in general, the actual "company_id" field of the form should be used for m2o domains, not this fallback + if (session.user_context.allowed_company_ids) { + var current_company = session.user_context.allowed_company_ids[0]; + } else { + var current_company = session.user_companies ? session.user_companies.current_company[0] : false; + } return _.extend({ active_id: evalContext.id || false, active_ids: evalContext.id ? [evalContext.id] : [], active_model: element.model, current_date: moment().format('YYYY-MM-DD'), id: evalContext.id || false, + current_company_id: current_company, }, session.user_context, element.context, evalContext); }, /** |