company_id constrain fix
This commit is contained in:
parent
ce93d9601c
commit
4139e5fa33
|
|
@ -14,7 +14,8 @@ class ProjectProject(models.Model):
|
||||||
if rec.name:
|
if rec.name:
|
||||||
existing = self.search([
|
existing = self.search([
|
||||||
('name', '=', rec.name),
|
('name', '=', rec.name),
|
||||||
('id', '!=', rec.id)
|
('id', '!=', rec.id),
|
||||||
|
('company_id','=',rec.company_id.id)
|
||||||
], limit=1)
|
], limit=1)
|
||||||
|
|
||||||
if existing:
|
if existing:
|
||||||
|
|
@ -1090,14 +1091,14 @@ class ProjectProject(models.Model):
|
||||||
members are users who can have an access to
|
members are users who can have an access to
|
||||||
the tasks related to this project."""
|
the tasks related to this project."""
|
||||||
)
|
)
|
||||||
user_id = fields.Many2one('res.users', string='Project Manager', default=False, tracking=True, #required = True,
|
user_id = fields.Many2one('res.users', string='Project Manager', default=False, tracking=True, required = True,
|
||||||
domain=lambda self: [('id','in',self.env.ref('project_task_timesheet_extended.role_project_manager').user_ids.ids),('groups_id', 'in', [self.env.ref('project.group_project_manager').id,self.env.ref('project_task_timesheet_extended.group_project_supervisor').id]),('share','=',False)],)
|
domain=lambda self: [('id','in',self.env.ref('project_task_timesheet_extended.role_project_manager').user_ids.ids),('groups_id', 'in', [self.env.ref('project.group_project_manager').id,self.env.ref('project_task_timesheet_extended.group_project_supervisor').id]),('share','=',False)],)
|
||||||
|
|
||||||
@api.constrains('user_id')
|
# @api.constrains('user_id')
|
||||||
def _check_team_lead_before_members(self):
|
# def _check_team_lead_before_members(self):
|
||||||
for rec in self:
|
# for rec in self:
|
||||||
if not rec.user_id:
|
# if not rec.user_id and not rec.company_id:
|
||||||
raise ValidationError("Assign Project Manager before adding members")
|
# raise ValidationError("Assign Project Manager before adding members")
|
||||||
|
|
||||||
type_ids = fields.Many2many(default=lambda self: self._default_type_ids())
|
type_ids = fields.Many2many(default=lambda self: self._default_type_ids())
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue