updated validation

This commit is contained in:
projectsodoo 2020-12-26 19:17:27 +05:30
parent a3691ad7fe
commit cb18d4975e
5 changed files with 36 additions and 5 deletions

View File

@ -6,4 +6,9 @@ from odoo import api, fields, models, _
class HrEmployee(models.Model):
_inherit = 'hr.employee'
budgeted_hour_week = fields.Integer("Budgeted Hours")
budgeted_hour_week = fields.Integer("Budgeted Hours")
class EmployeePublic(models.Model):
_inherit = 'hr.employee.public'
budgeted_hour_week = fields.Integer("Budgeted Hours")

View File

@ -43,7 +43,7 @@
<field name="recurrency_id" invisible='1'/>
<group>
<group>
<field name="employee_id"/>
<field name="employee_id" required="1"/>
<field name="role_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
@ -120,6 +120,8 @@
<search>
<field name="role_id"/>
<field name="employee_id"/>
<filter name="published" string="Published" domain="[('is_published','=',True)]"/>
<filter name="not_published" string="Not Published" domain="[('is_published','=',False)]"/>
<filter name="open_shifts" string="Open Shifts" domain="[('employee_id', '=', False)]"/>
<filter name="my_shifts" string="My Shifts" domain="[('user_id', '=', uid)]"/>
<separator/>

View File

@ -8,7 +8,7 @@
""",
'category': 'Operations/Project',
'version': '1.0',
'depends': ['project', 'planning'],
'depends': ['project', 'planning', 'cor_custom'],
'data': [
'views/planning_views.xml',
'views/project_forecast_views.xml',

View File

@ -29,6 +29,30 @@ class PlanningShift(models.Model):
else:
self.task_id.project_id = self.project_id
@api.onchange('employee_id')
def _onchange_employee_id(self):
domain = []
if self.employee_id and not self.employee_id.user_id:
self.project_id = False
domain = [('id', 'in', [])]
if self.employee_id:
self.project_id = False
domain = [('id', 'in', [])]
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_forecast', '=', True)]).ids
emp_project_ids = self.env['project.project'].search(
[('privacy_visibility', 'in', ('employees', 'portal')), ('allow_forecast', '=', True)]).ids
project_ids = self.env['project.project'].search(
[('privacy_visibility', '=', 'followers'), ('allow_forecast', '=', True),
('allowed_internal_user_ids', 'in', self.employee_id.user_id.id)]).ids
emp_all_project_ids = manager_id + emp_project_ids + project_ids
domain = [('id', 'in', list(set(emp_all_project_ids)))]
result = {
'domain': {'project_id': domain},
}
return result
@api.onchange('project_id')
def _onchange_project_id(self):
domain = [] if not self.project_id else [('project_id', '=', self.project_id.id)]

View File

@ -119,7 +119,7 @@
<!--
Menus
-->
<menuitem id="project_forecast_menu"
<!-- <menuitem id="project_forecast_menu"
name="Planning"
parent="project.menu_main_pm"
groups="planning.group_planning_user"
@ -135,7 +135,7 @@
name="By Project"
parent="project_forecast.project_forecast_menu"
sequence="20"
action="project_forecast_action_by_project"/>
action="project_forecast_action_by_project"/> -->
<menuitem id="project_forecast_report_activities"
name="Planning Analysis"