Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表

2023-07-14 15:02:15 +08:00
parent 808f57adfb a71497d3a8
commit a8e30a5228
451 changed files with 67979 additions and 17277 deletions
--- a/sf_plan_management/models/calendar_base.py
+++ b/sf_plan_management/models/calendar_base.py
@@ -179,7 +179,7 @@ class WorkLogSetting(models.Model):
            is_workday = single_date.strftime("%A")
            if is_workday in rest_days:
                print('is_workday in rest_days', is_workday)
-                self.env['sf.work.schedule.calendar'].create({
+                self.env['sf.work.schedule.calendar'].sudo().create({
                    'name': '休息日',
                    'name_id': self.id,
                    'calendar_code': self.code,