Permalink
Browse files

Merge branch '10.0' into 10.0-project_timelog-port

  • Loading branch information...
GabbasovDinar committed Sep 25, 2018
2 parents a7ab808 + 2a65174 commit 28863a48fa7b23a616f3ea9508a11efbe683fef2
@@ -18,7 +18,7 @@ class ProjectTaskSubtask(models.Model):
state = fields.Selection([(k, v) for k, v in SUBTASK_STATES.items()],
'Status', required=True, copy=False, default='todo')
name = fields.Char(required=True, string="Description")
reviewer_id = fields.Many2one('res.users', 'Reviewer', readonly=True, default=lambda self: self.env.user)
reviewer_id = fields.Many2one('res.users', 'Created by', readonly=True, default=lambda self: self.env.user)
project_id = fields.Many2one("project.project", related='task_id.project_id', store=True)
user_id = fields.Many2one('res.users', 'Assigned to', required=True)
task_id = fields.Many2one('project.task', 'Task', ondelete='cascade', required=True, index="1")
@@ -7,7 +7,7 @@
"category": "Hidden",
# "live_test_url": "",
"images": [],
"version": "10.0.1.0.0",
"version": "10.0.1.0.1",
"application": False,
"author": "IT-Projects LLC, Ivan Yelizariev",
@@ -1,4 +1,9 @@
`1.0.1`
-------
- **Fix:** Error on searching by website_dependent or company_dependent fields
`1.0.0`
-------
- Init version
- **Init version**
@@ -99,7 +99,7 @@ def search_multi(self, name, model, operator, value):
return super(IrProperty, self._check_website_dependent(
name, model,
**GET_CONTEXT
)).get(name, model, operator, value)
)).search_multi(name, model, operator, value)
@api.model
def set_multi(self, name, model, values, default_value=None):
@@ -59,6 +59,10 @@ def test_website_dependent(self):
self.assertEqual(record.with_context(context1).foo, 'alpha')
self.assertEqual(record.with_context(context2).foo, 'nowebsite')
# mostly for coverage of search_multi
res = self.env[MODEL].search([('foo', '=', False)])
self.assertFalse(res)
def _create_property(self, vals, record=None):
base_vals = {
'name': 'foo',

0 comments on commit 28863a4

Please sign in to comment.