diff --git a/yuthon_issue/security/issue_approval_group.xml b/yuthon_issue/security/issue_approval_group.xml new file mode 100644 index 000000000..b554eb7ef --- /dev/null +++ b/yuthon_issue/security/issue_approval_group.xml @@ -0,0 +1,15 @@ + + + + + 决策清单记录规则 + + + [('yuthon_company', 'in',self.env.user.employee_id.yuthon_company)] + + + + + + + \ No newline at end of file diff --git a/yuthon_performance/models/yuthon_plan_management.py b/yuthon_performance/models/yuthon_plan_management.py index 207eeb400..53eb094f0 100644 --- a/yuthon_performance/models/yuthon_plan_management.py +++ b/yuthon_performance/models/yuthon_plan_management.py @@ -20,6 +20,7 @@ class YuthonWorkTasksLine(models.Model): _description = "工作任务明细" plan_id = fields.Many2one('yuthon.plan.management','关联个人工作任务') + select_time = fields.Selection(related='plan_id.select_time',string='选择时间') task_type = fields.Selection([('KPI','KPI'),('GS','GS')],string='任务类型') task_name = fields.Many2one('yuthon.index.management',string='任务名称') plan = fields.Char('计划安排及具体措施行动')