[MERGE] forward port branch saas-11 up to 43bb85a501
This commit is contained in:
@@ -147,7 +147,7 @@ class AccountAnalyticLine(models.Model):
|
||||
|
||||
@api.multi
|
||||
def unlink(self):
|
||||
so_lines = self.mapped('so_line')
|
||||
so_lines = self.sudo().mapped('so_line')
|
||||
res = super(AccountAnalyticLine, self).unlink()
|
||||
so_lines.with_context(force_so_lines=so_lines).sudo()._compute_analytic()
|
||||
so_lines.with_context(force_so_lines=so_lines)._compute_analytic()
|
||||
return res
|
||||
|
||||
@@ -304,7 +304,7 @@ var KanbanView = View.extend({
|
||||
return this._super(action);
|
||||
},
|
||||
has_active_field: function() {
|
||||
return this.fields.active;
|
||||
return this.fields_view.fields.active;
|
||||
},
|
||||
_is_quick_create_enabled: function() {
|
||||
if(!_.contains(['char', 'boolean', 'many2one'], this.fields[this.group_by_field].type)){
|
||||
|
||||
Reference in New Issue
Block a user