diff --git a/soong_workflow/models/soong_workflow_inspector.py b/soong_workflow/models/soong_workflow_inspector.py index 2bd9c942b..8eee56ca3 100644 --- a/soong_workflow/models/soong_workflow_inspector.py +++ b/soong_workflow/models/soong_workflow_inspector.py @@ -33,7 +33,7 @@ class SoongWorkflowInspector(models.Model): inspector_line2_ids = fields.One2many('soong.workflow.inspector.line2', 'workflow_inspector_id', string='督办明细') relevancy_type = fields.Selection([('none', '无')], string="关联流程类型") - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class SoongWorkflowInspectorLine(models.Model): diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index c2ac7f2c3..c5f8900d1 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -34,7 +34,7 @@ class SoongWorkflowRecord(models.Model): res_model = fields.Char(string="Res Model", required=True) res_id = fields.Integer(string="Res ID", required=True) users_ids = fields.Many2many('res.users', string="用户") - employee_ids = fields.Many2many('hr.employee', string="当前经办人") + employee_ids = fields.Many2many('hr.employee', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) text = fields.Text(string="正文") documents_ids = fields.Many2many('ir.attachment', string="附件") workflow_id = fields.Many2one(comodel_name="soong.workflow", string="类型", ondelete="restrict") diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml index 220b4b520..1c860cb72 100644 --- a/soong_workflow/views/menuitem.xml +++ b/soong_workflow/views/menuitem.xml @@ -14,8 +14,22 @@ + + + - + 我的流程 ir.actions.act_window soong.workflow.record tree,kanban,search {'check_employee': 1, 'group_by': 'soong_state'} - [('users_ids', 'in', uid), ('reclaim_state', '=', False)] + [('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'start')] + + + + 我的流程 + ir.actions.act_window + soong.workflow.record + tree,kanban,search + {'check_employee': 1, 'group_by': 'soong_state'} + [('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending')] + + + + 我的流程 + ir.actions.act_window + soong.workflow.record + tree,kanban,search + {'check_employee': 1, 'group_by': 'soong_state'} + [('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'end')] diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 6fd7a1ed7..ddcf3af07 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -486,7 +486,7 @@ class HolidaysRequestBatch(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_day') def _onchange_is_day(self): diff --git a/yuthon_holiday/models/yuthon_fixes_approval.py b/yuthon_holiday/models/yuthon_fixes_approval.py index 0d06377de..cc60f5a60 100644 --- a/yuthon_holiday/models/yuthon_fixes_approval.py +++ b/yuthon_holiday/models/yuthon_fixes_approval.py @@ -39,7 +39,7 @@ class YuthonFixesApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('holiday_status') def _onchange_holiday_status(self): diff --git a/yuthon_hr_attendance/models/card_approval.py b/yuthon_hr_attendance/models/card_approval.py index e454bbbb7..a394008d8 100644 --- a/yuthon_hr_attendance/models/card_approval.py +++ b/yuthon_hr_attendance/models/card_approval.py @@ -35,7 +35,7 @@ class CardApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('attendance_id') def onchange_replacement_time(self): diff --git a/yuthon_hr_attendance/models/duty_approval.py b/yuthon_hr_attendance/models/duty_approval.py index c11586043..7eef8674b 100644 --- a/yuthon_hr_attendance/models/duty_approval.py +++ b/yuthon_hr_attendance/models/duty_approval.py @@ -29,7 +29,7 @@ class DutyApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.depends('date_start', 'date_end') def _compute_duration(self): diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py index 1acc0453f..43431bb6e 100644 --- a/yuthon_hr_attendance/models/go_approval.py +++ b/yuthon_hr_attendance/models/go_approval.py @@ -47,7 +47,7 @@ class GoApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('start_day_selection', 'end_day_selection') def _onchange_selection_fields(self): diff --git a/yuthon_hr_attendance/models/leave_approval.py b/yuthon_hr_attendance/models/leave_approval.py index d6c332b4d..e54e44ab6 100644 --- a/yuthon_hr_attendance/models/leave_approval.py +++ b/yuthon_hr_attendance/models/leave_approval.py @@ -25,7 +25,7 @@ class LeaveApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def leave_approval(self): pass \ No newline at end of file diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py index 1bc94c8a3..6681180a8 100644 --- a/yuthon_hr_attendance/models/overtime_approval.py +++ b/yuthon_hr_attendance/models/overtime_approval.py @@ -49,7 +49,7 @@ class OvertimeApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def open_record(self): if self.start_time and self.end_time and self.employee_ids: diff --git a/yuthon_hr_attendance/models/remove_holiday_approval.py b/yuthon_hr_attendance/models/remove_holiday_approval.py index 17a8ce3b6..2c63b9258 100644 --- a/yuthon_hr_attendance/models/remove_holiday_approval.py +++ b/yuthon_hr_attendance/models/remove_holiday_approval.py @@ -31,7 +31,7 @@ class RemoveHolidayApprovals(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_attendance/models/yuthon_abnormal_approval.py b/yuthon_hr_attendance/models/yuthon_abnormal_approval.py index c215c8de7..636b6257c 100644 --- a/yuthon_hr_attendance/models/yuthon_abnormal_approval.py +++ b/yuthon_hr_attendance/models/yuthon_abnormal_approval.py @@ -27,7 +27,7 @@ class YuthonAbnormalApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_attendance/models/yuthon_adjustments_approval.py b/yuthon_hr_attendance/models/yuthon_adjustments_approval.py index e5369df1b..4fb21debe 100644 --- a/yuthon_hr_attendance/models/yuthon_adjustments_approval.py +++ b/yuthon_hr_attendance/models/yuthon_adjustments_approval.py @@ -29,7 +29,7 @@ class YuthonAdjustmentsApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_attendance/models/yuthon_customer_approval.py b/yuthon_hr_attendance/models/yuthon_customer_approval.py index 1612e0b2f..7faea7653 100644 --- a/yuthon_hr_attendance/models/yuthon_customer_approval.py +++ b/yuthon_hr_attendance/models/yuthon_customer_approval.py @@ -28,7 +28,7 @@ class YuthonCustomerApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_attendance/models/yuthon_shift_approval.py b/yuthon_hr_attendance/models/yuthon_shift_approval.py index cf5075e5e..40390aa66 100644 --- a/yuthon_hr_attendance/models/yuthon_shift_approval.py +++ b/yuthon_hr_attendance/models/yuthon_shift_approval.py @@ -36,7 +36,7 @@ class YuthonShiftApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_attendance/models/yuthon_special_approval.py b/yuthon_hr_attendance/models/yuthon_special_approval.py index 518801879..1c25f07c9 100644 --- a/yuthon_hr_attendance/models/yuthon_special_approval.py +++ b/yuthon_hr_attendance/models/yuthon_special_approval.py @@ -32,7 +32,7 @@ class YuthonSpecialApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def button_special_approval(self): role_a = self.env['planning.role'].search([('name', '=', '联安粮库')], limit=1) diff --git a/yuthon_hr_employee_approval/models/yuthon_account_approval.py b/yuthon_hr_employee_approval/models/yuthon_account_approval.py index 5c71f1eb7..ecf2b4410 100644 --- a/yuthon_hr_employee_approval/models/yuthon_account_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_account_approval.py @@ -10,4 +10,4 @@ class YuthonAccountApproval(models.Model): code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_account_approval_code')) active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py b/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py index c894c8750..fca3fe7c4 100644 --- a/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py @@ -30,7 +30,7 @@ class YuthonAppointmentApproval(models.Model): def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_department_change.py b/yuthon_hr_employee_approval/models/yuthon_department_change.py index a40f4a5f1..78f3494b0 100644 --- a/yuthon_hr_employee_approval/models/yuthon_department_change.py +++ b/yuthon_hr_employee_approval/models/yuthon_department_change.py @@ -31,7 +31,7 @@ class YuthonDepartmentChange(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py b/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py index 03336c698..11074e246 100644 --- a/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py @@ -12,4 +12,4 @@ class YuthonEnrollmentApproval(models.Model): default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_enrollment_approval_code')) active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_hr_employee_approval/models/yuthon_interview_approval.py b/yuthon_hr_employee_approval/models/yuthon_interview_approval.py index 2ff2f077d..5fcaebffc 100644 --- a/yuthon_hr_employee_approval/models/yuthon_interview_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_interview_approval.py @@ -29,7 +29,7 @@ class YuthonInterviewApproval(models.Model): def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def scheduling_of_meetings(self): form_id = self.env.ref("room.room_booking_view_form").id diff --git a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py index 49d5a53d1..99057b8c6 100644 --- a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py @@ -37,7 +37,7 @@ class YuthonLeavingApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) active = fields.Boolean('Active', default=True, tracking=True) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def put_leaving(self): for record in self: diff --git a/yuthon_hr_employee_approval/models/yuthon_message_login.py b/yuthon_hr_employee_approval/models/yuthon_message_login.py index e051c5e57..e606cbe42 100644 --- a/yuthon_hr_employee_approval/models/yuthon_message_login.py +++ b/yuthon_hr_employee_approval/models/yuthon_message_login.py @@ -92,6 +92,7 @@ class YuthonMessageLogin(models.Model): urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') active = fields.Boolean('Active', default=True, tracking=True) + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index db9d407a7..4cc40d4c8 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -76,7 +76,7 @@ class YuthonOnboardApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('employee_name_id', 'job_id', 'department_id1') def _onchange_name(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py b/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py index 895f389c5..c04fb36bb 100644 --- a/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py @@ -27,7 +27,7 @@ class YuthonPrepareApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('adjust_information_ids') def onchange_change_index_library_ids(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py index 55b750da3..4c31e1ab3 100644 --- a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py @@ -34,7 +34,7 @@ class YuthonReassignmentApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) #异动信息 change_kind = fields.Char(string="异动类型") diff --git a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py index 089c7cdcc..46421b089 100644 --- a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py @@ -28,7 +28,7 @@ class YuthonRecruitmentApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py index cbcfa008f..cfc801425 100644 --- a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py @@ -50,7 +50,7 @@ class YuthonRegularizationPrepareApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) #试用信息明细行 trial_assessment_ids = fields.One2many('yuthon.trial.scenario.detail.line', 'regularization_login_id', string="试用期考核方案",help='请选择适用本人主岗的试用考核方案，或直接在下方填写') diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index a8f7fcdd1..73d51eb49 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -37,5 +37,5 @@ class YuthonRenewalApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) diff --git a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py index f5dde7af7..b3ad0ce41 100644 --- a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py @@ -37,7 +37,7 @@ class YuthonRetiredApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class YuthonHandoverLine(models.Model): diff --git a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py index 1757661d6..33d370ff3 100644 --- a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py @@ -29,7 +29,7 @@ class YuthonRewardApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_employee_approval/models/yuthon_service_approval.py b/yuthon_hr_employee_approval/models/yuthon_service_approval.py index 865c74609..0096d773e 100644 --- a/yuthon_hr_employee_approval/models/yuthon_service_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_service_approval.py @@ -26,7 +26,7 @@ class YuthonServiceApproval(models.Model): default='normal') active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py b/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py index 72e4ba54c..a9859cf0f 100644 --- a/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py @@ -40,5 +40,5 @@ class YuthonSocialFilesApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) diff --git a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py index a6ad827a1..986639aa5 100644 --- a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py @@ -41,7 +41,7 @@ class YutransferApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml b/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml index 14898000b..65191c82f 100644 --- a/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml @@ -73,13 +73,13 @@ - + diff --git a/yuthon_official/models/yuthon_offficial_incoming_party.py b/yuthon_official/models/yuthon_offficial_incoming_party.py index 3003df584..66629e54f 100644 --- a/yuthon_official/models/yuthon_offficial_incoming_party.py +++ b/yuthon_official/models/yuthon_offficial_incoming_party.py @@ -43,7 +43,7 @@ class YuthonOfficialIncomingParty(models.Model): active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_official/models/yuthon_official.py b/yuthon_official/models/yuthon_official.py index bc1b27ad4..5206bbca0 100644 --- a/yuthon_official/models/yuthon_official.py +++ b/yuthon_official/models/yuthon_official.py @@ -53,7 +53,7 @@ class YuthonOfficial(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def supervising_button(self): diff --git a/yuthon_official/models/yuthon_official_incoming_labor.py b/yuthon_official/models/yuthon_official_incoming_labor.py index 7fd9df4a9..3efb89e3d 100644 --- a/yuthon_official/models/yuthon_official_incoming_labor.py +++ b/yuthon_official/models/yuthon_official_incoming_labor.py @@ -43,7 +43,7 @@ class YuthonOfficialIncomingLabor(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_official/models/yuthon_official_incoming_normal.py b/yuthon_official/models/yuthon_official_incoming_normal.py index 47242301b..419870cfe 100644 --- a/yuthon_official/models/yuthon_official_incoming_normal.py +++ b/yuthon_official/models/yuthon_official_incoming_normal.py @@ -46,7 +46,7 @@ class YuthonOfficialIncomingNormal(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_official/models/yuthon_official_labor.py b/yuthon_official/models/yuthon_official_labor.py index 5cd7e46d2..1b0594a97 100644 --- a/yuthon_official/models/yuthon_official_labor.py +++ b/yuthon_official/models/yuthon_official_labor.py @@ -35,4 +35,4 @@ class YuthonOfficialLabor(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_official/models/yuthon_official_party.py b/yuthon_official/models/yuthon_official_party.py index 038cbd0c4..71659d60e 100644 --- a/yuthon_official/models/yuthon_official_party.py +++ b/yuthon_official/models/yuthon_official_party.py @@ -40,4 +40,4 @@ class YuthonOfficialParty(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_performance/models/yuthon_employee_approval.py b/yuthon_performance/models/yuthon_employee_approval.py index 20b78801a..8562eae34 100644 --- a/yuthon_performance/models/yuthon_employee_approval.py +++ b/yuthon_performance/models/yuthon_employee_approval.py @@ -23,7 +23,7 @@ class YuthonEmployeeApproval(models.Model): urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') work_end = fields.Boolean(string="结束") - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_performance/models/yuthon_index_approval.py b/yuthon_performance/models/yuthon_index_approval.py index 9396bd20d..f4f86c418 100644 --- a/yuthon_performance/models/yuthon_index_approval.py +++ b/yuthon_performance/models/yuthon_index_approval.py @@ -17,7 +17,7 @@ class YuthonIndexApproval(models.Model): new_index_library_ids = fields.One2many("new.index.management.line",'new_change_index_library_id',string="新组织指标库变更明细") work_end = fields.Boolean(string="结束") active = fields.Boolean('Active', default=True, tracking=True) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('change_index_library_ids') def onchange_change_index_library_ids(self): diff --git a/yuthon_performance/models/yuthon_tissue_duty_approval.py b/yuthon_performance/models/yuthon_tissue_duty_approval.py index dc363fc9c..1397eae80 100644 --- a/yuthon_performance/models/yuthon_tissue_duty_approval.py +++ b/yuthon_performance/models/yuthon_tissue_duty_approval.py @@ -26,7 +26,7 @@ class YuthonTissueDutyApproval(models.Model): urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') work_end = fields.Boolean(string="结束") - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/perperty_claim_approval.py b/yuthon_property_approval/models/perperty_claim_approval.py index c4bdd6e89..e9bbab630 100644 --- a/yuthon_property_approval/models/perperty_claim_approval.py +++ b/yuthon_property_approval/models/perperty_claim_approval.py @@ -30,7 +30,7 @@ class PropertyClaimApproval(models.Model): def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class PropertyClaimLine(models.Model): _name = 'property.claim.line' diff --git a/yuthon_property_approval/models/property_accounting_approval.py b/yuthon_property_approval/models/property_accounting_approval.py index e11ccfef0..c2d11a94d 100644 --- a/yuthon_property_approval/models/property_accounting_approval.py +++ b/yuthon_property_approval/models/property_accounting_approval.py @@ -38,7 +38,7 @@ class PropertyAccountingApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class AccountingWayLine(models.Model): diff --git a/yuthon_property_approval/models/property_accounts_approval.py b/yuthon_property_approval/models/property_accounts_approval.py index 260c8ebff..37ead4cba 100644 --- a/yuthon_property_approval/models/property_accounts_approval.py +++ b/yuthon_property_approval/models/property_accounts_approval.py @@ -31,7 +31,7 @@ class PropertyAccountsApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) # 流程结束触发方法 def put_button(self): diff --git a/yuthon_property_approval/models/property_approval.py b/yuthon_property_approval/models/property_approval.py index 4b5f58be2..62656b7a0 100644 --- a/yuthon_property_approval/models/property_approval.py +++ b/yuthon_property_approval/models/property_approval.py @@ -34,7 +34,7 @@ class PropertyApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def put_message_in(self): # 导入按钮 return { diff --git a/yuthon_property_approval/models/property_borrowing_approval.py b/yuthon_property_approval/models/property_borrowing_approval.py index 921d870bb..a76b4f551 100644 --- a/yuthon_property_approval/models/property_borrowing_approval.py +++ b/yuthon_property_approval/models/property_borrowing_approval.py @@ -26,7 +26,7 @@ class PropertyBorrowingApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) active = fields.Boolean('Active', default=True, tracking=True) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class YuthonBorrowingLine(models.Model): diff --git a/yuthon_property_approval/models/property_capacity.py b/yuthon_property_approval/models/property_capacity.py index 90f20bc61..4e3d0ac16 100644 --- a/yuthon_property_approval/models/property_capacity.py +++ b/yuthon_property_approval/models/property_capacity.py @@ -33,7 +33,7 @@ class PropertyCapacity(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_construction_approval.py b/yuthon_property_approval/models/property_construction_approval.py index 2e037150d..23b9cd224 100644 --- a/yuthon_property_approval/models/property_construction_approval.py +++ b/yuthon_property_approval/models/property_construction_approval.py @@ -38,7 +38,7 @@ class PropertyConstructionApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class ConstructionWayLine(models.Model): diff --git a/yuthon_property_approval/models/property_current_approval.py b/yuthon_property_approval/models/property_current_approval.py index 6d37d21de..bbfb48576 100644 --- a/yuthon_property_approval/models/property_current_approval.py +++ b/yuthon_property_approval/models/property_current_approval.py @@ -62,4 +62,4 @@ class PropertyCurrentApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) diff --git a/yuthon_property_approval/models/property_delegated_agent.py b/yuthon_property_approval/models/property_delegated_agent.py index 5320b4fa6..acfef131c 100644 --- a/yuthon_property_approval/models/property_delegated_agent.py +++ b/yuthon_property_approval/models/property_delegated_agent.py @@ -28,6 +28,6 @@ class PropertyDelegatedAgent(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) diff --git a/yuthon_property_approval/models/property_design_approval.py b/yuthon_property_approval/models/property_design_approval.py index c683e8b61..9a91c43a2 100644 --- a/yuthon_property_approval/models/property_design_approval.py +++ b/yuthon_property_approval/models/property_design_approval.py @@ -35,7 +35,7 @@ class PropertyDesignApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class DesignWayLine(models.Model): diff --git a/yuthon_property_approval/models/property_early_quitting.py b/yuthon_property_approval/models/property_early_quitting.py index 69245af5a..36c6eddca 100644 --- a/yuthon_property_approval/models/property_early_quitting.py +++ b/yuthon_property_approval/models/property_early_quitting.py @@ -37,7 +37,7 @@ class PropertyEarlyQuitting(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def button_approval(self): for rec in self: diff --git a/yuthon_property_approval/models/property_eligibility.py b/yuthon_property_approval/models/property_eligibility.py index 2602e04f4..71980afaa 100644 --- a/yuthon_property_approval/models/property_eligibility.py +++ b/yuthon_property_approval/models/property_eligibility.py @@ -32,7 +32,7 @@ class PropertyEligibility(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class PropertyEligibilityLine(models.Model): _name = 'property.eligibility.line' diff --git a/yuthon_property_approval/models/property_engineering_approval.py b/yuthon_property_approval/models/property_engineering_approval.py index bdb88fdc4..fa81ef121 100644 --- a/yuthon_property_approval/models/property_engineering_approval.py +++ b/yuthon_property_approval/models/property_engineering_approval.py @@ -58,4 +58,4 @@ class PropertyEngineeringApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) diff --git a/yuthon_property_approval/models/property_evaluate_application.py b/yuthon_property_approval/models/property_evaluate_application.py index 8f88f00be..662574ed7 100644 --- a/yuthon_property_approval/models/property_evaluate_application.py +++ b/yuthon_property_approval/models/property_evaluate_application.py @@ -36,7 +36,7 @@ class PropertyEvaluateApplication(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def put_property_record(self): form_id = self.env.ref('yuthon_property_approval.views_property_record_form').id diff --git a/yuthon_property_approval/models/property_fitment.py b/yuthon_property_approval/models/property_fitment.py index 9edb5c6a9..dfa03adb0 100644 --- a/yuthon_property_approval/models/property_fitment.py +++ b/yuthon_property_approval/models/property_fitment.py @@ -37,4 +37,4 @@ class PropertyFitment(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_handover.py b/yuthon_property_approval/models/property_handover.py index 4aa4116d3..6a7cc7e97 100644 --- a/yuthon_property_approval/models/property_handover.py +++ b/yuthon_property_approval/models/property_handover.py @@ -30,7 +30,7 @@ class PropertyHandover(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_intention_approval.py b/yuthon_property_approval/models/property_intention_approval.py index 4cadbfdaf..f651064e6 100644 --- a/yuthon_property_approval/models/property_intention_approval.py +++ b/yuthon_property_approval/models/property_intention_approval.py @@ -28,7 +28,7 @@ class PropertyIntentionApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index c640e4481..f530ee2b9 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -212,7 +212,7 @@ class PropertyLeaseContract(models.Model): store=True) responsibility_book_name = fields.Char(string="安全生产责任书(住宅)名称", compute='_compute_attachment_names', store=True) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.depends() def _compute_not_received(self): diff --git a/yuthon_property_approval/models/property_lease_extension.py b/yuthon_property_approval/models/property_lease_extension.py index bc81cccc8..29e32c709 100644 --- a/yuthon_property_approval/models/property_lease_extension.py +++ b/yuthon_property_approval/models/property_lease_extension.py @@ -37,7 +37,7 @@ class PropertyLeaseExtension(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) def button_approval(self): for rec in self: diff --git a/yuthon_property_approval/models/property_management.py b/yuthon_property_approval/models/property_management.py index 21eaf4227..a2017d9fd 100644 --- a/yuthon_property_approval/models/property_management.py +++ b/yuthon_property_approval/models/property_management.py @@ -41,7 +41,7 @@ class PropertyManagement(models.Model): name_title = fields.Char(default=_get_default_name_title) document_ids = fields.Many2many('ir.attachment', string="附件") - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('precinct_id') def _onchange_precinct_id(self): diff --git a/yuthon_property_approval/models/property_management_fee.py b/yuthon_property_approval/models/property_management_fee.py index b69b88dbc..007ffe883 100644 --- a/yuthon_property_approval/models/property_management_fee.py +++ b/yuthon_property_approval/models/property_management_fee.py @@ -26,7 +26,7 @@ class PropertyManagementFee(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) #类型 diff --git a/yuthon_property_approval/models/property_meeting_approval.py b/yuthon_property_approval/models/property_meeting_approval.py index dec29bf3b..cb6fadd51 100644 --- a/yuthon_property_approval/models/property_meeting_approval.py +++ b/yuthon_property_approval/models/property_meeting_approval.py @@ -29,7 +29,7 @@ class PropertyMeetingApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_merge_approval.py b/yuthon_property_approval/models/property_merge_approval.py index 7c2c0f617..b0fb173cc 100644 --- a/yuthon_property_approval/models/property_merge_approval.py +++ b/yuthon_property_approval/models/property_merge_approval.py @@ -33,7 +33,7 @@ class PropertyMergeApproval(models.Model): def _get_default_name_title(self): return self._description if self._description else self._name - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) name_title = fields.Char(default=_get_default_name_title) related_issues_id = fields.Many2one('issue.library', string="关联议题") diff --git a/yuthon_property_approval/models/property_offline_registration.py b/yuthon_property_approval/models/property_offline_registration.py index b251e3f78..ae191d057 100644 --- a/yuthon_property_approval/models/property_offline_registration.py +++ b/yuthon_property_approval/models/property_offline_registration.py @@ -34,7 +34,7 @@ class PropertyOfflineRegistration(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_open_rent.py b/yuthon_property_approval/models/property_open_rent.py index b0b3f1ae1..611e31098 100644 --- a/yuthon_property_approval/models/property_open_rent.py +++ b/yuthon_property_approval/models/property_open_rent.py @@ -24,7 +24,7 @@ class PropertyOpenRent(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) # # # class PropertyOpenRentLine(models.Model): diff --git a/yuthon_property_approval/models/property_penalty_relief.py b/yuthon_property_approval/models/property_penalty_relief.py index 37c75afd0..65cb25199 100644 --- a/yuthon_property_approval/models/property_penalty_relief.py +++ b/yuthon_property_approval/models/property_penalty_relief.py @@ -35,7 +35,7 @@ class PropertyPenaltyRelief(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_project_approval.py b/yuthon_property_approval/models/property_project_approval.py index 075e58abf..aad47ad65 100644 --- a/yuthon_property_approval/models/property_project_approval.py +++ b/yuthon_property_approval/models/property_project_approval.py @@ -27,4 +27,4 @@ class PropertyProjectApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_project_works.py b/yuthon_property_approval/models/property_project_works.py index 598312ccb..e05713ac6 100644 --- a/yuthon_property_approval/models/property_project_works.py +++ b/yuthon_property_approval/models/property_project_works.py @@ -28,4 +28,4 @@ class PropertyProjectWorks(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_record.py b/yuthon_property_approval/models/property_record.py index 145b97c0a..a06e3d48c 100644 --- a/yuthon_property_approval/models/property_record.py +++ b/yuthon_property_approval/models/property_record.py @@ -35,7 +35,7 @@ class PropertyRecord(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_renamed.py b/yuthon_property_approval/models/property_renamed.py index 20d591c6b..e56bf6190 100644 --- a/yuthon_property_approval/models/property_renamed.py +++ b/yuthon_property_approval/models/property_renamed.py @@ -30,4 +30,4 @@ class PropertyRenamed(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_rent_relief.py b/yuthon_property_approval/models/property_rent_relief.py index a3843bc78..1bd89d84f 100644 --- a/yuthon_property_approval/models/property_rent_relief.py +++ b/yuthon_property_approval/models/property_rent_relief.py @@ -34,7 +34,7 @@ class PropertyRentRelief(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_rental_conditions.py b/yuthon_property_approval/models/property_rental_conditions.py index f9b223431..1d1870b97 100644 --- a/yuthon_property_approval/models/property_rental_conditions.py +++ b/yuthon_property_approval/models/property_rental_conditions.py @@ -30,7 +30,7 @@ class PropertyRentalConditions(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class NowRentalConditionsLine(models.Model): _name = 'now.rental.conditions.line' diff --git a/yuthon_property_approval/models/property_rental_form.py b/yuthon_property_approval/models/property_rental_form.py index 0679a8980..883532732 100644 --- a/yuthon_property_approval/models/property_rental_form.py +++ b/yuthon_property_approval/models/property_rental_form.py @@ -28,7 +28,7 @@ class PropertyRentalForm(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class PropertyRentalFormLine(models.Model): _name = 'property.rental.form.line' diff --git a/yuthon_property_approval/models/property_service_approval.py b/yuthon_property_approval/models/property_service_approval.py index 3e5e996c8..be054e366 100644 --- a/yuthon_property_approval/models/property_service_approval.py +++ b/yuthon_property_approval/models/property_service_approval.py @@ -66,4 +66,4 @@ class PropertyServiceApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) diff --git a/yuthon_property_approval/models/property_split_approval.py b/yuthon_property_approval/models/property_split_approval.py index 265037b35..87e1da0d7 100644 --- a/yuthon_property_approval/models/property_split_approval.py +++ b/yuthon_property_approval/models/property_split_approval.py @@ -35,7 +35,7 @@ class PropertySplitApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('split_quantity', 'property_id') def _onchange_split_quantity(self): diff --git a/yuthon_property_approval/models/property_sporadic_works.py b/yuthon_property_approval/models/property_sporadic_works.py index 27cc16bd0..2db33be94 100644 --- a/yuthon_property_approval/models/property_sporadic_works.py +++ b/yuthon_property_approval/models/property_sporadic_works.py @@ -27,7 +27,7 @@ class PropertySporadicWorks(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class PaymentMethodsLine(models.Model): diff --git a/yuthon_property_approval/models/property_supervising_approval.py b/yuthon_property_approval/models/property_supervising_approval.py index feecb920d..aa98a467b 100644 --- a/yuthon_property_approval/models/property_supervising_approval.py +++ b/yuthon_property_approval/models/property_supervising_approval.py @@ -35,7 +35,7 @@ class PropertySupervisingApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class SupervisingWayLine(models.Model): _name = 'supervising.way.line' diff --git a/yuthon_property_approval/models/property_transaction_confirmed.py b/yuthon_property_approval/models/property_transaction_confirmed.py index 382b793b0..6559e8075 100644 --- a/yuthon_property_approval/models/property_transaction_confirmed.py +++ b/yuthon_property_approval/models/property_transaction_confirmed.py @@ -31,7 +31,7 @@ class PropertyTransactionConfirmed(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_property_approval/models/property_transfer_approval.py b/yuthon_property_approval/models/property_transfer_approval.py index 5f2a21f2a..f7a95c2d8 100644 --- a/yuthon_property_approval/models/property_transfer_approval.py +++ b/yuthon_property_approval/models/property_transfer_approval.py @@ -41,7 +41,7 @@ class PropertyTransferApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): if self.is_issues: diff --git a/yuthon_trade/models/yuthon_business_approval.py b/yuthon_trade/models/yuthon_business_approval.py index 1b75d58e6..d2f17195c 100644 --- a/yuthon_trade/models/yuthon_business_approval.py +++ b/yuthon_trade/models/yuthon_business_approval.py @@ -27,7 +27,7 @@ class YuthonBusinessApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_trade/models/yuthon_care_condolences.py b/yuthon_trade/models/yuthon_care_condolences.py index 3de0e61c8..701189276 100644 --- a/yuthon_trade/models/yuthon_care_condolences.py +++ b/yuthon_trade/models/yuthon_care_condolences.py @@ -31,7 +31,7 @@ class YuthonCareCondolences(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) diff --git a/yuthon_trade/models/yuthon_message_approval.py b/yuthon_trade/models/yuthon_message_approval.py index 8ee239c32..bca3eb0d4 100644 --- a/yuthon_trade/models/yuthon_message_approval.py +++ b/yuthon_trade/models/yuthon_message_approval.py @@ -28,7 +28,7 @@ class YuthonMessageApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) class YuthonPublishType(models.Model): _name = 'yuthon.publish.type' diff --git a/yuthon_trade/models/yuthon_mutual_approval.py b/yuthon_trade/models/yuthon_mutual_approval.py index 2b3c7770b..9b022b8ea 100644 --- a/yuthon_trade/models/yuthon_mutual_approval.py +++ b/yuthon_trade/models/yuthon_mutual_approval.py @@ -18,7 +18,7 @@ class YuthonMutualApproval(models.Model): insurance_ids = fields.One2many('yuthon.mutual.line', 'mutual_id', string="保单名称") work_end = fields.Boolean(string="结束") active = fields.Boolean('Active', default=True, tracking=True) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('users_id', 'insurance_ids') def _onchange_set_employee_id(self): diff --git a/yuthon_trade/models/yuthon_personal_condolences.py b/yuthon_trade/models/yuthon_personal_condolences.py index 87d05bac0..463a2c391 100644 --- a/yuthon_trade/models/yuthon_personal_condolences.py +++ b/yuthon_trade/models/yuthon_personal_condolences.py @@ -11,4 +11,4 @@ class YuthonPersonalCondolences(models.Model): default=lambda self: self.env['ir.sequence'].next_by_code('property_personal_condolences_code_sequence')) work_end = fields.Boolean(string="结束") active = fields.Boolean('Active', default=True, tracking=True) - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_trade/models/yuthon_seals_approval.py b/yuthon_trade/models/yuthon_seals_approval.py index b4c8084fe..6790926b5 100644 --- a/yuthon_trade/models/yuthon_seals_approval.py +++ b/yuthon_trade/models/yuthon_seals_approval.py @@ -27,4 +27,4 @@ class YuthonSealsApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) diff --git a/yuthon_trade/models/yuthon_task_approval.py b/yuthon_trade/models/yuthon_task_approval.py index 3ef6df2ce..b74cbbe7b 100644 --- a/yuthon_trade/models/yuthon_task_approval.py +++ b/yuthon_trade/models/yuthon_task_approval.py @@ -36,7 +36,7 @@ class YuthonTaskApproval(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.onchange('employee_ids', 'task_id') def _onchange_employee_task(self): diff --git a/yuthon_trade/models/yuthon_trade_activities.py b/yuthon_trade/models/yuthon_trade_activities.py index 91905fc46..cd29985b9 100644 --- a/yuthon_trade/models/yuthon_trade_activities.py +++ b/yuthon_trade/models/yuthon_trade_activities.py @@ -24,4 +24,4 @@ class YuthonTradeActivities(models.Model): joint_office_ids = fields.Many2many("hr.department", string="联办") work_end = fields.Boolean(string="结束") active = fields.Boolean('Active', default=True, tracking=True) - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_trade/models/yuthon_trade_premium.py b/yuthon_trade/models/yuthon_trade_premium.py index b29f329ef..e1b9cce91 100644 --- a/yuthon_trade/models/yuthon_trade_premium.py +++ b/yuthon_trade/models/yuthon_trade_premium.py @@ -30,7 +30,7 @@ class YuthonTradePremium(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) @api.depends('employee_ids') def _compute_employee_ids(self): diff --git a/yuthon_trade/models/yuthon_work_condolences.py b/yuthon_trade/models/yuthon_work_condolences.py index 3825d47a3..44ab2718f 100644 --- a/yuthon_trade/models/yuthon_work_condolences.py +++ b/yuthon_trade/models/yuthon_work_condolences.py @@ -26,4 +26,4 @@ class YuthonWorkCondolences(models.Model): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) - self_users_ids = fields.Many2many('res.users', string="当前经办人") \ No newline at end of file + self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) \ No newline at end of file diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py index 525b71adc..57718046e 100644 --- a/yuthon_will_task/models/yuthon_will_task.py +++ b/yuthon_will_task/models/yuthon_will_task.py @@ -102,7 +102,7 @@ class YuthonWillTask(models.Model): column1='task_id', column2='user_id', string="当前经办人", - store=True, + store=True, default=lambda self: [(6, 0, [self.env.user.id])] )