From b2f6d2bb2ed9f0c48be37ace972998b73da884f2 Mon Sep 17 00:00:00 2001 From: "pawan.sharma" Date: Thu, 8 Jul 2021 17:43:50 +0530 Subject: [PATCH 1/2] update pluggin --- .../models/company_resource_calendar.py | 19 +++++++++++++++++++ .../views/company_resource_calendar_view.xml | 1 + 2 files changed, 20 insertions(+) diff --git a/company_public_holidays_kanak/models/company_resource_calendar.py b/company_public_holidays_kanak/models/company_resource_calendar.py index a0e0e2c..2ba2c39 100644 --- a/company_public_holidays_kanak/models/company_resource_calendar.py +++ b/company_public_holidays_kanak/models/company_resource_calendar.py @@ -82,6 +82,25 @@ class CompanyResourceCalendar(models.Model): if not existing_calender: Calendar.create(holiday) + # def action_holiday_update_timeoff_calendar(self): + # public_holiday = [] + # holiday_id = self.env['hr.leave.type'].search([], limit=1) + # company = self.env['res.company'].search([], limit=1) + # employee = self.env['hr.employee'].search([], limit=1) + # leave_calendar = self.env['hr.leave'] + # for comp_global_leave in self.company_global_leave_ids: + # public_holiday.append({ + # 'name': "Holiday"+"/"+comp_global_leave.name, + # 'date_from': comp_global_leave.date_from, + # 'date_to': comp_global_leave.date_to, + # 'holiday_status_id': holiday_id.id, + # 'employee_id': employee.id + # }) + # for holiday in public_holiday: + # existing_calender = leave_calendar.search([('date_from', '=', holiday['date_from'])]) + # if not existing_calender: + # leave_calendar.create(holiday) + class CompanyResourceCalendarLeaves(models.Model): _name = 'company.resource.calendar.leaves' diff --git a/company_public_holidays_kanak/views/company_resource_calendar_view.xml b/company_public_holidays_kanak/views/company_resource_calendar_view.xml index 24899f3..925b913 100644 --- a/company_public_holidays_kanak/views/company_resource_calendar_view.xml +++ b/company_public_holidays_kanak/views/company_resource_calendar_view.xml @@ -29,6 +29,7 @@
From 894160e02c2314ab32d57f7ef4f90ed60289fe33 Mon Sep 17 00:00:00 2001 From: "pawan.sharma" Date: Fri, 9 Jul 2021 15:04:24 +0530 Subject: [PATCH 2/2] comment custom code --- .../models/company_resource_calendar.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/company_public_holidays_kanak/models/company_resource_calendar.py b/company_public_holidays_kanak/models/company_resource_calendar.py index 2ba2c39..7c7b483 100644 --- a/company_public_holidays_kanak/models/company_resource_calendar.py +++ b/company_public_holidays_kanak/models/company_resource_calendar.py @@ -86,15 +86,22 @@ class CompanyResourceCalendar(models.Model): # public_holiday = [] # holiday_id = self.env['hr.leave.type'].search([], limit=1) # company = self.env['res.company'].search([], limit=1) - # employee = self.env['hr.employee'].search([], limit=1) - # leave_calendar = self.env['hr.leave'] + # employee = self.env['hr.employee'].search([('id', '=', 14)], limit=1) + # #leave_calendar = self.env['hr.leave'] + # leave_calendar = self.env['hr.leave'].with_context( + # tracking_disable=True, + # mail_activity_automation_skip=True, + # leave_fast_create=True, + # leave_skip_state_check=True, + # ) # for comp_global_leave in self.company_global_leave_ids: # public_holiday.append({ # 'name': "Holiday"+"/"+comp_global_leave.name, # 'date_from': comp_global_leave.date_from, # 'date_to': comp_global_leave.date_to, # 'holiday_status_id': holiday_id.id, - # 'employee_id': employee.id + # 'employee_id': employee.id, + # 'state': 'validate' # }) # for holiday in public_holiday: # existing_calender = leave_calendar.search([('date_from', '=', holiday['date_from'])])