subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into 'master' 

Development

See merge request prakash.jain/cor-odoo!155
This commit is contained in:
prakash.jain 2021-03-09 22:44:44 -08:00
parent d9a1a8166e f683b91994
commit a716e7bdc2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cor_custom/models/analytic.py
View File

@ -22,8 +22,7 @@ class AccountAnalyticLine(models.Model):
])
return domain
project_id = fields.Many2one(
'project.project', 'Project', compute='_compute_project_id', store=True, readonly=False,
project_id = fields.Many2one('project.project', 'Project', compute='_compute_project_id', store=True, readonly=False,
domain=_domain_project_id)
#start_time = fields.Float(string='Start Time', digits=(16, 2))
#end_time = fields.Float(string='End Time', digits=(16, 2))
@ -57,11 +56,11 @@ class AccountAnalyticLine(models.Model):
domain = []
if self.employee_id and self.employee_id.user_id:
manager_id = self.env['project.project'].search(
[('user_id', '=', self.employee_id.user_id.id), ('allow_timesheets', '=', True)]).ids
[('user_id', '=', self.employee_id.user_id.id), ('allow_timesheets', '=', True),('is_sub_project', '=', False)]).ids
emp_project_ids = self.env['project.project'].search(
[('privacy_visibility', 'in', ('employees', 'portal')), ('allow_timesheets', '=', True)]).ids
[('privacy_visibility', 'in', ('employees', 'portal')), ('allow_timesheets', '=', True),('is_sub_project', '=', False)]).ids
project_ids = self.env['project.project'].search(
[('privacy_visibility', '=', 'followers'), ('allow_timesheets', '=', True),
[('privacy_visibility', '=', 'followers'), ('allow_timesheets', '=', True),('is_sub_project', '=', False),
('allowed_internal_user_ids', 'in', self.employee_id.user_id.id)]).ids
consul_ids = self.env['project.sale.line.employee.map'].search([('employee_id', '=', self.employee_id.id)])
consul_project_ids = [val.project_id.id for val in consul_ids]