[MERGE] forward port branch saas-11.3 up to ea0b3d600d
This commit is contained in:
@@ -168,6 +168,7 @@ QUnit.test('Activity Done keep feedback on blur', function (assert) {
|
||||
View: FormView,
|
||||
model: 'partner',
|
||||
data: this.data,
|
||||
services: this.services,
|
||||
res_id: 2,
|
||||
arch:'<form string="Partners">' +
|
||||
'<div class="oe_chatter">' +
|
||||
|
||||
@@ -399,6 +399,7 @@ class Project(models.Model):
|
||||
action_context = safe_eval(action['context']) if action['context'] else {}
|
||||
action_context.update(self._context)
|
||||
action_context['search_default_parent_res_name'] = self.name
|
||||
action_context.pop('group_by', None)
|
||||
return dict(action, context=action_context)
|
||||
|
||||
# ---------------------------------------------------
|
||||
|
||||
@@ -106,9 +106,11 @@ class Rating(models.Model):
|
||||
'parent_res_id': False,
|
||||
}
|
||||
if hasattr(current_record, 'rating_get_parent'):
|
||||
parent_res_model = getattr(current_record, current_record.rating_get_parent())
|
||||
data['parent_res_model_id'] = self.env['ir.model']._get(parent_res_model._name).id
|
||||
data['parent_res_id'] = parent_res_model.id
|
||||
current_record_parent = current_record.rating_get_parent()
|
||||
if current_record_parent:
|
||||
parent_res_model = getattr(current_record, current_record_parent)
|
||||
data['parent_res_model_id'] = self.env['ir.model']._get(parent_res_model._name).id
|
||||
data['parent_res_id'] = parent_res_model.id
|
||||
return data
|
||||
|
||||
@api.multi
|
||||
|
||||
Reference in New Issue
Block a user