diff --git a/soong_workflow/models/soong_workflow_entrust.py b/soong_workflow/models/soong_workflow_entrust.py index ef8120ffa..d9fcef88b 100644 --- a/soong_workflow/models/soong_workflow_entrust.py +++ b/soong_workflow/models/soong_workflow_entrust.py @@ -134,3 +134,4 @@ class EntrustAll(models.Model): _description = "全部流程" name = fields.Char(string='name') + work_end = fields.Boolean(string='流程结束') diff --git a/soong_workflow/views/soong_workflow_entrust_views.xml b/soong_workflow/views/soong_workflow_entrust_views.xml index e9d592310..8240e3068 100644 --- a/soong_workflow/views/soong_workflow_entrust_views.xml +++ b/soong_workflow/views/soong_workflow_entrust_views.xml @@ -73,6 +73,7 @@ + diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index ee3ff0632..db0ca06ed 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -710,7 +710,7 @@ class HolidaysRequestBatch(models.Model): @api.depends('users_id') def _compute_holiday_allowance(self): for record in self: - reports_id = self.env['yuthon.vacation.reports'].search([('employee_id', '=', record.users_id.employee_id.id)], limit=1) + reports_id = self.env['yuthon.vacation.reports'].search([('employee_id', '=', record.users_id.employee_ids.id)], limit=1) if reports_id and not record.log_ids: leave_days = reports_id.leave overtime_days = reports_id.working_overtime diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml index e5bbbaa32..7cf502a27 100644 --- a/yuthon_holiday/views/hr_leave_batch.xml +++ b/yuthon_holiday/views/hr_leave_batch.xml @@ -54,7 +54,7 @@ - + diff --git a/yuthon_holiday/views/yuthon_fixes_approval_views.xml b/yuthon_holiday/views/yuthon_fixes_approval_views.xml index 984d54db4..fdb4df22d 100644 --- a/yuthon_holiday/views/yuthon_fixes_approval_views.xml +++ b/yuthon_holiday/views/yuthon_fixes_approval_views.xml @@ -43,6 +43,7 @@ + diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py index 43431bb6e..996a99ac5 100644 --- a/yuthon_hr_attendance/models/go_approval.py +++ b/yuthon_hr_attendance/models/go_approval.py @@ -64,7 +64,7 @@ class GoApprovals(models.Model): if start > end: raise ValidationError("开始时间必须小于结束时间，请重新设置。") delta = end - start - self.days = delta.days + self.days = (delta.days) + 1 self.hours = delta.seconds // 3600 @api.onchange('is_issues') @@ -97,7 +97,7 @@ class GoApprovals(models.Model): for record in self: if record.statr_date and record.end_date: delta = record.end_date - record.statr_date - record.days = delta.days if delta.days >= 0 else 0 # 防止负数 + record.days = delta.days + 1 if delta.days >= 0 else 0 # 防止负数 else: record.days = 0 @@ -124,7 +124,7 @@ class GoApprovals(models.Model): """根据开始日期和天数计算结束日期""" if self.statr_date and self.days: # 计算结束日期 - self.end_date = self.statr_date + timedelta(days=self.days) + self.end_date = self.statr_date + timedelta(days=self.days) - timedelta(days=1) @api.onchange('hours') def _onchange_calculate_end_datetime(self): diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index f78aa1c28..6eee1e0bf 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -332,6 +332,9 @@ class HrAttendance(models.Model): "res_model": "go.approval", "views": [[form_id, "form"]], "context": { + 'default_is_day': True, + 'default_statr_date': self.current_data, + 'default_end_date': self.current_data, 'default_users_id': self.employee_id.user_id.id, } } diff --git a/yuthon_hr_attendance/wizard/attendance_controls_wizard.py b/yuthon_hr_attendance/wizard/attendance_controls_wizard.py index 178f3e2fd..ffb225c27 100644 --- a/yuthon_hr_attendance/wizard/attendance_controls_wizard.py +++ b/yuthon_hr_attendance/wizard/attendance_controls_wizard.py @@ -54,6 +54,10 @@ class AttendanceControlsWizard(models.TransientModel): "views": [[form_id, "form"]], "context": { 'default_users_id': self.attendance_id.employee_id.user_id.id, + 'default_is_day': True, + 'reason_application': '事由', + 'default_statr_date': self.attendance_id.current_data, + 'default_end_date': self.attendance_id.current_data, } } diff --git a/yuthon_hr_employee_approval/models/yuthon_system_approval.py b/yuthon_hr_employee_approval/models/yuthon_system_approval.py index 4e4be888c..65d6719fd 100644 --- a/yuthon_hr_employee_approval/models/yuthon_system_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_system_approval.py @@ -11,4 +11,5 @@ class YuthonSystemTitleApproval(models.Model): name = fields.Char(string='名称') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_system_approval_code')) + work_end = fields.Boolean() active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_hr_employee_approval/views/yuthon_enrollment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_enrollment_approval_views.xml index a6825d938..fa9644c65 100644 --- a/yuthon_hr_employee_approval/views/yuthon_enrollment_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_enrollment_approval_views.xml @@ -18,6 +18,7 @@ + diff --git a/yuthon_hr_employee_approval/views/yuthon_rank_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_rank_approval_views.xml index 42fb99ae7..ed2876345 100644 --- a/yuthon_hr_employee_approval/views/yuthon_rank_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_rank_approval_views.xml @@ -18,6 +18,7 @@ + diff --git a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml index 7e8862014..c828fe754 100644 --- a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml @@ -45,6 +45,7 @@ + diff --git a/yuthon_hr_employee_approval/views/yuthon_salary_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_salary_approval_views.xml index 1cb1e2697..11fd09d71 100644 --- a/yuthon_hr_employee_approval/views/yuthon_salary_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_salary_approval_views.xml @@ -18,6 +18,7 @@ + diff --git a/yuthon_hr_employee_approval/views/yuthon_system_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_system_approval_views.xml index 85c68ce15..6ac342463 100644 --- a/yuthon_hr_employee_approval/views/yuthon_system_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_system_approval_views.xml @@ -18,6 +18,7 @@ + diff --git a/yuthon_performance/views/yuthon_tissue_duty_approval.xml b/yuthon_performance/views/yuthon_tissue_duty_approval.xml index 5e210c71c..5e3f98238 100644 --- a/yuthon_performance/views/yuthon_tissue_duty_approval.xml +++ b/yuthon_performance/views/yuthon_tissue_duty_approval.xml @@ -22,6 +22,7 @@ + diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index 7b4140b1b..eeb22ee74 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -287,10 +287,10 @@ + - @@ -371,9 +371,9 @@ + - @@ -414,9 +414,9 @@ + - diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml index 5f8652a04..6cf6fc703 100644 --- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml +++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml @@ -381,9 +381,9 @@ + - diff --git a/yuthon_property_approval/views/property_billing_confirmation.xml b/yuthon_property_approval/views/property_billing_confirmation.xml index 537bb1415..ef79a225a 100644 --- a/yuthon_property_approval/views/property_billing_confirmation.xml +++ b/yuthon_property_approval/views/property_billing_confirmation.xml @@ -27,6 +27,7 @@ + diff --git a/yuthon_property_approval/views/property_collection_confirm.xml b/yuthon_property_approval/views/property_collection_confirm.xml index 80ffdf446..c269e931e 100644 --- a/yuthon_property_approval/views/property_collection_confirm.xml +++ b/yuthon_property_approval/views/property_collection_confirm.xml @@ -26,6 +26,7 @@ + diff --git a/yuthon_property_approval/views/property_confirm_views.xml b/yuthon_property_approval/views/property_confirm_views.xml index d1268f481..3f48ca15f 100644 --- a/yuthon_property_approval/views/property_confirm_views.xml +++ b/yuthon_property_approval/views/property_confirm_views.xml @@ -25,6 +25,7 @@ + diff --git a/yuthon_property_approval/views/property_construction_work.xml b/yuthon_property_approval/views/property_construction_work.xml index d6047f8a5..33bf8ed06 100644 --- a/yuthon_property_approval/views/property_construction_work.xml +++ b/yuthon_property_approval/views/property_construction_work.xml @@ -23,6 +23,7 @@ + diff --git a/yuthon_property_approval/views/property_information.xml b/yuthon_property_approval/views/property_information.xml index d5cc64213..51802b156 100644 --- a/yuthon_property_approval/views/property_information.xml +++ b/yuthon_property_approval/views/property_information.xml @@ -26,6 +26,7 @@ + diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml index ff39851b1..93279d682 100644 --- a/yuthon_property_approval/views/property_lease_contract.xml +++ b/yuthon_property_approval/views/property_lease_contract.xml @@ -818,9 +818,9 @@ + - diff --git a/yuthon_property_approval/views/property_lease_renewal.xml b/yuthon_property_approval/views/property_lease_renewal.xml index d65cff68e..d0c771aa6 100644 --- a/yuthon_property_approval/views/property_lease_renewal.xml +++ b/yuthon_property_approval/views/property_lease_renewal.xml @@ -25,6 +25,7 @@ + diff --git a/yuthon_property_approval/views/property_management.xml b/yuthon_property_approval/views/property_management.xml index 093874d81..4288491ff 100644 --- a/yuthon_property_approval/views/property_management.xml +++ b/yuthon_property_approval/views/property_management.xml @@ -39,7 +39,6 @@ -

@@ -92,16 +91,16 @@ - + - - - + + + diff --git a/yuthon_property_approval/views/property_open_rent_views.xml b/yuthon_property_approval/views/property_open_rent_views.xml index 10f7abe47..d9054db6a 100644 --- a/yuthon_property_approval/views/property_open_rent_views.xml +++ b/yuthon_property_approval/views/property_open_rent_views.xml @@ -26,6 +26,7 @@ + diff --git a/yuthon_property_approval/views/property_utility_bills.xml b/yuthon_property_approval/views/property_utility_bills.xml index 21ea8f3dd..562914be7 100644 --- a/yuthon_property_approval/views/property_utility_bills.xml +++ b/yuthon_property_approval/views/property_utility_bills.xml @@ -25,6 +25,7 @@ + diff --git a/yuthon_trade/models/inherit_workflow_record.py b/yuthon_trade/models/inherit_workflow_record.py index e0cc60eaf..157fb98fc 100644 --- a/yuthon_trade/models/inherit_workflow_record.py +++ b/yuthon_trade/models/inherit_workflow_record.py @@ -19,8 +19,10 @@ class InheritWorkflowRecord(models.Model): soong_workflow_list.append((0, 0, { 'workflow_record_id': record.id, })) - if related_record.document_ids: + if hasattr(related_record, 'document_ids') and related_record.document_ids: document_list.extend(related_record.document_ids.ids) + elif hasattr(related_record, 'documents_ids') and related_record.documents_ids: + document_list.extend(related_record.documents_ids.ids) return { "name": _("盖章审批"), diff --git a/yuthon_trade/views/yuthon_mutual_approval_views.xml b/yuthon_trade/views/yuthon_mutual_approval_views.xml index 04f38a6e7..5b2ba2314 100644 --- a/yuthon_trade/views/yuthon_mutual_approval_views.xml +++ b/yuthon_trade/views/yuthon_mutual_approval_views.xml @@ -40,6 +40,7 @@

+ diff --git a/yuthon_trade/views/yuthon_trade_activities.xml b/yuthon_trade/views/yuthon_trade_activities.xml index 3ca16b611..eb619ae6d 100644 --- a/yuthon_trade/views/yuthon_trade_activities.xml +++ b/yuthon_trade/views/yuthon_trade_activities.xml @@ -32,6 +32,7 @@ + diff --git a/yuthon_trade/views/yuthon_trade_premium.xml b/yuthon_trade/views/yuthon_trade_premium.xml index 46e6bda28..8b76b30d0 100644 --- a/yuthon_trade/views/yuthon_trade_premium.xml +++ b/yuthon_trade/views/yuthon_trade_premium.xml @@ -38,6 +38,7 @@ +