diff --git a/employee_late_check_in/README.rst b/employee_late_check_in/README.rst old mode 100644 new mode 100755 index b58b8b7ac..a290ac054 --- a/employee_late_check_in/README.rst +++ b/employee_late_check_in/README.rst @@ -1,6 +1,6 @@ -.. image:: https://img.shields.io/badge/license-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 +.. image:: https://img.shields.io/badge/license-LGPL--3-blue.svg + :target: https://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 Employee Late Check-in ====================== @@ -16,8 +16,8 @@ Company License ------- -Affero General Public License, Version 3 (AGPL v3). -(https://www.gnu.org/licenses/agpl-3.0-standalone.html) +* Lesser General Public License, Version 3 (LGPL v3). +(https://www.gnu.org/licenses/lgpl-3.0-standalone.html) Credits ------- diff --git a/employee_late_check_in/__init__.py b/employee_late_check_in/__init__.py old mode 100644 new mode 100755 index de7bbf156..8e8f0faa8 --- a/employee_late_check_in/__init__.py +++ b/employee_late_check_in/__init__.py @@ -1,35 +1,22 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # # Copyright (C) 2024-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions (odoo@cybrosys.com) +# Author: Cybrosys Techno Solutions() # -# You can modify it under the terms of the GNU AFFERO -# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. # -# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE -# (AGPL v3) along with this program. +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################. from . import models -from odoo import SUPERUSER_ID -from odoo.api import Environment - -def post_init_hook(cr, registry): - env = Environment(cr, SUPERUSER_ID, {}) - - cron = env.ref('employee_late_check_in.ir_cron_late_check_in', - raise_if_not_found=False) - if cron: - model = env[cron.model_id.model] - method = getattr(model, 'late_check_in_records', None) - if method: - method() diff --git a/employee_late_check_in/__manifest__.py b/employee_late_check_in/__manifest__.py old mode 100644 new mode 100755 index 222f4a1fd..5313bc384 --- a/employee_late_check_in/__manifest__.py +++ b/employee_late_check_in/__manifest__.py @@ -1,57 +1,56 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # # Copyright (C) 2024-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions (odoo@cybrosys.com) +# Author: Cybrosys Techno Solutions() # -# You can modify it under the terms of the GNU AFFERO -# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. # -# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE -# (AGPL v3) along with this program. +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################. { - "name": "Employee Late Check-in", - "version": "16.0.1.0.1", - "category": "Human Resources", - "summary": "Employee Late Check-in module for tracking and managing late " - "check-ins of employees and may deduct salary from payslip", - "description": "The module is designed for meticulous tracking and " - "management of employee punctuality. It enables " - "organizations to monitor late check-ins efficiently, " - "offering insights into tardiness patterns. With a " - "user-friendly interface, it provides a comprehensive " - "overview of individual employee records, facilitating " - "timely interventions. This module contributes to fostering" - " a punctual and efficient work environment.", - "author": "Cybrosys Techno Solutions", - "company": "Cybrosys Techno Solutions", - "maintainer": "Cybrosys Techno Solutions", - "website": "https://www.cybrosys.com", - "depends": ["hr_attendance", "hr_payroll_community"], - "data": [ - "security/ir.model.access.csv", - "data/ir_cron_data.xml", - "data/salary_rule.xml", - "views/res_config_settings_views.xml", - "views/hr_attendance_views.xml", - "views/late_check_in_views.xml", - "views/hr_employee_views.xml", - "views/hr_payslip_views.xml", + 'name': 'Employee Late Check-in', + 'version': '16.0.1.0.0', + 'category': 'Human Resources', + 'summary': 'Employee Late Check-in module for tracking and managing late ' + 'check-ins of employees and may deduct salary from payslip', + 'description': 'The module is designed for meticulous tracking and ' + 'management of employee punctuality. It enables ' + 'organizations to monitor late check-ins efficiently, ' + 'offering insights into tardiness patterns. With a ' + 'user-friendly interface, it provides a comprehensive ' + 'overview of individual employee records, facilitating ' + 'timely interventions. This module contributes to fostering' + ' a punctual and efficient work environment.', + 'author': "Cybrosys Techno Solutions", + 'company': 'Cybrosys Techno Solutions', + 'maintainer': 'Cybrosys Techno Solutions', + 'website': 'https://www.cybrosys.com', + 'depends': ['hr_attendance', 'hr_payroll_community', 'hr_contract_types'], + 'data': [ + 'security/ir.model.access.csv', + 'data/ir_cron_data.xml', + 'data/salary_rule.xml', + 'views/res_config_settings_views.xml', + 'views/hr_attendance_views.xml', + 'views/late_check_in_views.xml', + 'views/hr_employee_views.xml', + 'views/hr_payslip_views.xml', ], - "images": ["static/description/banner.png"], - "license": "AGPL-3", - "installable": True, - "auto_install": False, - "application": False, - "post_init_hook": "post_init_hook" + 'images': ['static/description/banner.png'], + 'license': 'LGPL-3', + 'installable': True, + 'auto_install': False, + 'application': False, } diff --git a/employee_late_check_in/data/ir_cron_data.xml b/employee_late_check_in/data/ir_cron_data.xml old mode 100644 new mode 100755 index 01812556b..4ba8a4352 --- a/employee_late_check_in/data/ir_cron_data.xml +++ b/employee_late_check_in/data/ir_cron_data.xml @@ -1,17 +1,15 @@ - - - Attendance: Late Check-in - - code - model.late_check_in_records() - - 1 - days - -1 - - + + + Attendance: Late Check-in + + code + model.late_check_in_records() + + 1 + days + -1 + + - - diff --git a/employee_late_check_in/data/salary_rule.xml b/employee_late_check_in/data/salary_rule.xml old mode 100644 new mode 100755 index 007bb0dc9..463e93ff1 --- a/employee_late_check_in/data/salary_rule.xml +++ b/employee_late_check_in/data/salary_rule.xml @@ -1,6 +1,6 @@ - + Late Check-in @@ -14,7 +14,8 @@ try: amount = inputs.LC.amount except: amount = 0 -result = -amount +result = -amount + diff --git a/employee_late_check_in/doc/RELEASE_NOTES.md b/employee_late_check_in/doc/RELEASE_NOTES.md index ebb728b29..62ff93c5d 100644 --- a/employee_late_check_in/doc/RELEASE_NOTES.md +++ b/employee_late_check_in/doc/RELEASE_NOTES.md @@ -10,3 +10,10 @@ #### Version 16.0.1.0.1 #### UPDATE - Updated scheduled action and ensured amount updates in the late-check-in. Displayed time-off when generating payslip and deducted late check in amount from it. + +#### 12.08.2024 +#### Version 16.0.1.0.2 +#### UPDATE + - Bug Fix in Employee Late Check-in + + diff --git a/employee_late_check_in/models/__init__.py b/employee_late_check_in/models/__init__.py old mode 100644 new mode 100755 index b19b25579..b962e565d --- a/employee_late_check_in/models/__init__.py +++ b/employee_late_check_in/models/__init__.py @@ -1,24 +1,24 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # # Copyright (C) 2024-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions (odoo@cybrosys.com) +# Author: Cybrosys Techno Solutions() # -# You can modify it under the terms of the GNU AFFERO -# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. # -# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE -# (AGPL v3) along with this program. +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################. from . import hr_attendance from . import hr_employee from . import hr_employees_public diff --git a/employee_late_check_in/models/hr_attendance.py b/employee_late_check_in/models/hr_attendance.py old mode 100644 new mode 100755 index 2bcc57cdf..3bdaa11bf --- a/employee_late_check_in/models/hr_attendance.py +++ b/employee_late_check_in/models/hr_attendance.py @@ -1,40 +1,39 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # # Copyright (C) 2024-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions (odoo@cybrosys.com) +# Author: Cybrosys Techno Solutions() # -# You can modify it under the terms of the GNU AFFERO -# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. # -# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE -# (AGPL v3) along with this program. +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################. import pytz from datetime import datetime, timedelta -from odoo import fields, models +from odoo import api,fields, models class HrAttendance(models.Model): """Inherit the module to add fields and methods""" - - _inherit = "hr.attendance" + _inherit = 'hr.attendance' late_check_in = fields.Integer( - string="Late Check-in(Minutes)", - compute="_compute_late_check_in", + string="Late Check-in(Minutes)", compute="_compute_late_check_in", help="This indicates the duration of the employee's tardiness.", - ) + store=True) + @api.depends('check_in') def _compute_late_check_in(self): """Calculate late check-in minutes for each record in the current Odoo model.This method iterates through the records and calculates late @@ -44,77 +43,62 @@ class HrAttendance(models.Model): for rec in self: rec.late_check_in = 0.0 if rec.employee_id.contract_id: - for schedule in ( - rec.sudo() - .employee_id.contract_id.resource_calendar_id.sudo() - .attendance_ids - ): - if ( - schedule.dayofweek == str(rec.sudo().check_in.weekday()) - and schedule.day_period == "morning" - ): + for schedule in rec.sudo().employee_id.contract_id.resource_calendar_id.sudo().attendance_ids: + if (schedule.dayofweek == str( + rec.sudo().check_in.weekday()) and + schedule.day_period == 'morning'): dt = rec.check_in if self.env.user.tz in pytz.all_timezones: - old_tz = pytz.timezone("UTC") + old_tz = pytz.timezone('UTC') new_tz = pytz.timezone(self.env.user.tz) dt = old_tz.localize(dt).astimezone(new_tz) str_time = dt.strftime("%H:%M") - check_in_date = datetime.strptime(str_time, "%H:%M").time() + check_in_date = datetime.strptime( + str_time, "%H:%M").time() start_date = datetime.strptime( - "{0:02.0f}:{1:02.0f}".format( - *divmod(schedule.hour_from * 60, 60) - ), - "%H:%M", - ).time() - check_in = timedelta( - hours=check_in_date.hour, minutes=check_in_date.minute - ) - start_date = timedelta( - hours=start_date.hour, minutes=start_date.minute - ) + '{0:02.0f}:{1:02.0f}'.format(*divmod( + schedule.hour_from * 60, 60)), + "%H:%M").time() + check_in = timedelta(hours=check_in_date.hour, + minutes=check_in_date.minute) + start_date = timedelta(hours=start_date.hour, + minutes=start_date.minute) if check_in > start_date: final = check_in - start_date rec.sudo().late_check_in = final.total_seconds() / 60 def late_check_in_records(self): """Function creates records in late.check.in model for the employees - who were late as a scheduled action""" - minutes_after = ( - int( - self.env["ir.config_parameter"] - .sudo() - .get_param("employee_late_check_in.late_check_in_after") - ) - or 0 - ) - max_limit = ( - int( - self.env["ir.config_parameter"] - .sudo() - .get_param("employee_late_check_in.maximum_minutes") - ) - or 0 - ) - for rec in self.sudo().search( - [ - ( - "id", - "not in", - self.env["late.check.in"].sudo().search([]).attendance_id.ids, - ) - ] - ): - late_check_in = rec.sudo().late_check_in + 210 - if ( - rec.late_check_in > minutes_after - and late_check_in > minutes_after - and late_check_in < max_limit - ): - self.env["late.check.in"].sudo().create( - { - "employee_id": rec.employee_id.id, - "late_minutes": late_check_in, - "date": rec.check_in.date(), - "attendance_id": rec.id, - } - ) + who were late""" + minutes_after = int( + self.env['ir.config_parameter'].sudo().get_param( + 'employee_late_check_in.late_check_in_after')) or 0 + max_limit = int(self.env['ir.config_parameter'].sudo().get_param( + 'employee_late_check_in.maximum_minutes')) or 0 + for rec in self.sudo().search([]): + print(rec,minutes_after) + if rec.id not in self.env['late.check.in'].sudo().search( + []).attendance_id.ids: + if minutes_after < rec.late_check_in < max_limit: + print(rec,'rec') + self.env['late.check.in'].sudo().create({ + 'employee_id': rec.employee_id.id, + 'late_minutes': rec.late_check_in, + 'date': rec.check_in.date(), + 'attendance_id': rec.id, + }) + else: + self.env['late.check.in'].sudo().search( + [('attendance_id', '=', rec.id)]).update({ + 'late_minutes': rec.late_check_in, + 'date': rec.check_in.date(), + 'attendance_id': rec.id, + }) + + def unlink(self): + """Override the unlink method to delete the corresponding records in + late.check.in model""" + for record in self: + self.env['late.check.in'].sudo().search( + [('attendance_id', '=', record.id)]).unlink() + return super(HrAttendance, self).unlink() diff --git a/employee_late_check_in/models/hr_employee.py b/employee_late_check_in/models/hr_employee.py old mode 100644 new mode 100755 index 7edbea8ac..f7bf0fec9 --- a/employee_late_check_in/models/hr_employee.py +++ b/employee_late_check_in/models/hr_employee.py @@ -1,56 +1,51 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # # Copyright (C) 2024-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions (odoo@cybrosys.com) +# Author: Cybrosys Techno Solutions() # -# You can modify it under the terms of the GNU AFFERO -# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. # -# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE -# (AGPL v3) along with this program. +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. # If not, see . # -############################################################################### -from odoo import fields, models, _ +############################################################################. +from odoo import _, fields, models class HrEmployee(models.Model): """Inherit the model to add fields and methods""" - - _inherit = "hr.employee" + _inherit = 'hr.employee' late_check_in_count = fields.Integer( - string="Late Check-In", - compute="_compute_late_check_in_count", - help="Count of employee's late checkin", - ) + string="Late Check-In", compute="_compute_late_check_in_count", + help="Count of employee's late checkin") def action_to_open_late_check_in_records(self): """ - :return: dictionary defining the action to open the late check-in - records window. - :rtype: dict + :return: dictionary defining the action to open the late check-in + records window. + :rtype: dict """ return { - "name": _("Employee Late Check-in"), - "domain": [("employee_id", "=", self.id)], - "res_model": "late.check.in", - "type": "ir.actions.act_window", - "view_mode": "tree,form", - "limit": 80, - } + 'name': _('Employee Late Check-in'), + 'domain': [('employee_id', '=', self.id)], + 'res_model': 'late.check.in', + 'type': 'ir.actions.act_window', + 'view_mode': 'tree,form', + 'limit': 80} def _compute_late_check_in_count(self): """Compute the late check-in count""" for rec in self: - rec.late_check_in_count = self.env["late.check.in"].search_count( - [("employee_id", "=", rec.id)] - ) + rec.late_check_in_count = self.env['late.check.in'].search_count( + [('employee_id', '=', rec.id)]) diff --git a/employee_late_check_in/models/hr_employees_public.py b/employee_late_check_in/models/hr_employees_public.py old mode 100644 new mode 100755 index 8fd6ab279..b92699289 --- a/employee_late_check_in/models/hr_employees_public.py +++ b/employee_late_check_in/models/hr_employees_public.py @@ -1,56 +1,52 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # # Copyright (C) 2024-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions (odoo@cybrosys.com) +# Author: Cybrosys Techno Solutions() # -# You can modify it under the terms of the GNU AFFERO -# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. # -# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE -# (AGPL v3) along with this program. +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. # If not, see . # -############################################################################### -from odoo import fields, models, _ +############################################################################. +from odoo import _, fields, models class HrEmployees(models.Model): """Inherit the model to add fields and functions""" - - _inherit = "hr.employee.public" + _inherit = 'hr.employee.public' late_check_in_count = fields.Integer( - string="Late Check-In", - compute="_compute_late_check_in_count", - help="Count of employee's late checkin", - ) + string="Late Check-In", compute="_compute_late_check_in_count", + help="Count of employee's late checkin") def action_to_open_late_check_in_records(self): """ - :return: dictionary defining the action to open the late check-in - records window. - :rtype: dict + :return: dictionary defining the action to open the late check-in + records window. + :rtype: dict """ return { - "name": _("Employee Late Check-in"), - "domain": [("employee_id", "=", self.id)], - "res_model": "late.check.in", - "type": "ir.actions.act_window", - "view_mode": "tree,form", - "limit": 80, + 'name': _('Employee Late Check-in'), + 'domain': [('employee_id', '=', self.id)], + 'res_model': 'late.check.in', + 'type': 'ir.actions.act_window', + 'view_mode': 'tree,form', + 'limit': 80, } def _compute_late_check_in_count(self): """Compute the late check-in count""" for rec in self: - rec.late_check_in_count = self.env["late.check.in"].search_count( - [("employee_id", "=", rec.id)] - ) + rec.late_check_in_count = self.env['late.check.in'].search_count( + [('employee_id', '=', rec.id)]) diff --git a/employee_late_check_in/models/hr_payslip.py b/employee_late_check_in/models/hr_payslip.py old mode 100644 new mode 100755 index e18131cad..6d61fada4 --- a/employee_late_check_in/models/hr_payslip.py +++ b/employee_late_check_in/models/hr_payslip.py @@ -1,59 +1,54 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # # Copyright (C) 2024-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions (odoo@cybrosys.com) +# Author: Cybrosys Techno Solutions() # -# You can modify it under the terms of the GNU AFFERO -# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. # -# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE -# (AGPL v3) along with this program. +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################. from odoo import api, fields, models class PayslipLateCheckIn(models.Model): """Inherit the model to add fields and functions""" - - _inherit = "hr.payslip" + _inherit = 'hr.payslip' late_check_in_ids = fields.Many2many( - "late.check.in", - string="Late Check-in", - help="Late check-in records of the employee", - ) + 'late.check.in', string='Late Check-in', + help='Late check-in records of the employee') @api.model def get_inputs(self, contracts, date_from, date_to): """Function used for writing late check-in record in the payslip input - tree.""" - res = super(PayslipLateCheckIn, self).get_inputs(contracts, date_to, date_from) - late_check_in_type = self.env.ref("employee_late_check_in.late_check_in") - late_check_in_id = self.env["late.check.in"].search( - [ - ("employee_id", "=", self.employee_id.id), - ("date", "<=", self.date_to), - ("date", ">=", self.date_from), - ("state", "=", "approved"), - ] - ) + tree.""" + res = super(PayslipLateCheckIn, self).get_inputs(contracts, date_to, + date_from) + late_check_in_type = self.env.ref( + 'employee_late_check_in.late_check_in') + late_check_in_id = self.env['late.check.in'].search( + [('employee_id', '=', self.employee_id.id), + ('date', '<=', self.date_to), ('date', '>=', self.date_from), + ('state', '=', 'approved')]) if late_check_in_id: self.late_check_in_ids = late_check_in_id input_data = { - "name": late_check_in_type.name, - "code": late_check_in_type.code, - "amount": sum(late_check_in_id.mapped("penalty_amount")), - "contract_id": self.contract_id.id, + 'name': late_check_in_type.name, + 'code': late_check_in_type.code, + 'amount': sum(late_check_in_id.mapped('penalty_amount')), + 'contract_id': self.contract_id.id, } res.append(input_data) return res @@ -61,5 +56,5 @@ class PayslipLateCheckIn(models.Model): def action_payslip_done(self): """Function used for marking deducted Late check-in request.""" for rec in self.late_check_in_ids: - rec.state = "deducted" + rec.state = 'deducted' return super(PayslipLateCheckIn, self).action_payslip_done() diff --git a/employee_late_check_in/models/late_check_in.py b/employee_late_check_in/models/late_check_in.py old mode 100644 new mode 100755 index 376d36ff1..2da79495c --- a/employee_late_check_in/models/late_check_in.py +++ b/employee_late_check_in/models/late_check_in.py @@ -1,87 +1,73 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # # Copyright (C) 2024-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions (odoo@cybrosys.com) +# Author: Cybrosys Techno Solutions() # -# You can modify it under the terms of the GNU AFFERO -# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. # -# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE -# (AGPL v3) along with this program. +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################. from odoo import api, fields, models class LateCheckIn(models.Model): """Model to store late check-in records""" - - _name = "late.check.in" - _description = "Late Check In" + _name = 'late.check.in' + _description = 'Late Check In' name = fields.Char( - readonly=True, string="Name", help="Reference number of the record" - ) - employee_id = fields.Many2one( - "hr.employee", string="Employee", help="Late employee" - ) - late_minutes = fields.Integer( - string="Late Minutes", - help="The field indicates the number of minutes the worker is late.", - ) - date = fields.Date(string="Date", help="Current date") - penalty_amount = fields.Float( - compute="_compute_penalty_amount", - help="Amount needs to be deducted", - string="Amount", - ) - state = fields.Selection( - selection=[ - ("draft", "Draft"), - ("approved", "Approved"), - ("refused", "Refused"), - ("deducted", "Deducted"), - ], - string="State", - default="draft", - help="State of the record", - ) - attendance_id = fields.Many2one( - "hr.attendance", string="Attendance", help="Attendance of the employee" - ) + readonly=True, string='Name', help="Reference number of the record") + employee_id = fields.Many2one('hr.employee', string="Employee", + help='Late employee') + late_minutes = fields.Integer(string="Late Minutes", + help='The field indicates the number of ' + 'minutes the worker is late.') + date = fields.Date(string="Date", help='Current date') + penalty_amount = fields.Float(compute="_compute_penalty_amount", + help='Amount needs to be deducted', + string="Amount",) + state = fields.Selection(selection=[('draft', 'Draft'), + ('approved', 'Approved'), + ('refused', 'Refused'), + ('deducted', 'Deducted')], + string="State", default="draft", + help='State of the record') + attendance_id = fields.Many2one('hr.attendance', string='Attendance', + help='Attendance of the employee') @api.model def create(self, vals_list): """Create a sequence for the model""" - vals_list["name"] = self.env["ir.sequence"].next_by_code("late.check.in") or "/" + vals_list['name'] = self.env['ir.sequence'].next_by_code( + 'late.check.in') or '/' return super(LateCheckIn, self.sudo()).create(vals_list) def _compute_penalty_amount(self): """Compute the penalty amount if the employee was late""" for rec in self: - amount = float( - self.env["ir.config_parameter"].sudo().get_param("employee_late_check_in.deduction_amount") - ) + amount = float(self.env['ir.config_parameter'].sudo().get_param( + 'employee_late_check_in.deduction_amount')) rec.penalty_amount = amount - if ( - self.env["ir.config_parameter"].sudo().get_param("employee_late_check_in.deduction_type") - == "minutes" - ): + if self.env['ir.config_parameter'].sudo().get_param( + 'employee_late_check_in.deduction_type') == 'minutes': rec.penalty_amount = amount * rec.late_minutes def approve(self): """Change state to approved when approve button clicks""" - self.state = "approved" + self.state = 'approved' def reject(self): """Change state refused when refuse button clicks""" - self.state = "refused" + self.state = 'refused' diff --git a/employee_late_check_in/models/res_company.py b/employee_late_check_in/models/res_company.py old mode 100644 new mode 100755 index 56efc30b9..4584c77de --- a/employee_late_check_in/models/res_company.py +++ b/employee_late_check_in/models/res_company.py @@ -1,52 +1,45 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # # Copyright (C) 2024-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions (odoo@cybrosys.com) +# Author: Cybrosys Techno Solutions() # -# You can modify it under the terms of the GNU AFFERO -# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. # -# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE -# (AGPL v3) along with this program. +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################. from odoo import fields, models class ResCompany(models.Model): """Inherit the model to add fields""" - - _inherit = "res.company" + _inherit = 'res.company' deduction_amount = fields.Float( - help="How much amount need to be deducted if a employee was late", - string="Deduction Amount", - ) + help='How much amount need to be deducted if a employee was late', + string="Deduction Amount",) currency_id = fields.Many2one( - "res.currency", default=lambda self: self.env.company.currency_id.id - ) + 'res.currency', default=lambda self: self.env.company.currency_id.id) maximum_minutes = fields.Char( help="Maximum time limit a employee was considered as late", - string="Maximum Late Minute", - ) + string="Maximum Late Minute") late_check_in_after = fields.Char( - help="When should the late check-in count down starts.", - string="Late Check-in Starts After", - ) + help='When should the late check-in count down starts.', + string="Late Check-in Starts After",) deduction_type = fields.Selection( - selection=[("minutes", "Per Minutes"), ("total", "Per Total")], - default="minutes", - string="Deduction Type", - help="Type of deduction, (If Per Minutes is chosen then for each " - "minutes given amount is deducted, if Per Total is chosen then " - "given amount is deducted from the total salary)", - ) + selection=[('minutes', 'Per Minutes'), ('total', 'Per Total')], + default="minutes", string='Deduction Type', + help='Type of deduction, (If Per Minutes is chosen then for each ' + 'minutes given amount is deducted, if Per Total is chosen then ' + 'given amount is deducted from the total salary)') diff --git a/employee_late_check_in/models/res_config_settings.py b/employee_late_check_in/models/res_config_settings.py old mode 100644 new mode 100755 index 0be99e4d3..b00d25621 --- a/employee_late_check_in/models/res_config_settings.py +++ b/employee_late_check_in/models/res_config_settings.py @@ -1,56 +1,49 @@ # -*- coding: utf-8 -*- -############################################################################### +############################################################################# # # Cybrosys Technologies Pvt. Ltd. # # Copyright (C) 2024-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions (odoo@cybrosys.com) +# Author: Cybrosys Techno Solutions() # -# You can modify it under the terms of the GNU AFFERO -# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. # -# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE -# (AGPL v3) along with this program. +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. # If not, see . # -############################################################################### +############################################################################. from odoo import fields, models class LateCheckinSettings(models.TransientModel): """Inherit the model to add fields""" - - _inherit = "res.config.settings" + _inherit = 'res.config.settings' deduction_amount = fields.Float( - config_parameter="employee_late_check_in.deduction_amount", - help="How much amount need to be deducted if a employee was late", - string="Deduction Amount", - ) + config_parameter='employee_late_check_in.deduction_amount', + help='How much amount need to be deducted if a employee was late', + string="Deduction Amount",) maximum_minutes = fields.Char( - config_parameter="employee_late_check_in.maximum_minutes", + config_parameter='employee_late_check_in.maximum_minutes', help="Maximum time limit a employee was considered as late", - string="Maximum Late Minute", - ) + string="Maximum Late Minute") late_check_in_after = fields.Char( - config_parameter="employee_late_check_in.late_check_in_after", - help="When should the late check-in count down starts.", - string="Late Check-in Starts After", - ) + config_parameter='employee_late_check_in.late_check_in_after', + help='When should the late check-in count down starts.', + string="Late Check-in Starts After",) deduction_type = fields.Selection( - selection=[("minutes", "Per Minutes"), ("total", "Per Total")], - config_parameter="employee_late_check_in.deduction_type", - default="minutes", - string="Deduction Type", - help="Type of deduction, (If Per Minutes is chosen then for each " - "minutes given amount is deducted, if Per Total is chosen then " - "given amount is deducted from the total salary)", - ) + selection=[('minutes', 'Per Minutes'), ('total', 'Per Total')], + config_parameter='employee_late_check_in.deduction_type', + default="minutes", string='Deduction Type', + help='Type of deduction, (If Per Minutes is chosen then for each ' + 'minutes given amount is deducted, if Per Total is chosen then ' + 'given amount is deducted from the total salary)') currency_id = fields.Many2one( - "res.currency", default=lambda self: self.env.company.currency_id.id - ) + 'res.currency', default=lambda self: self.env.company.currency_id.id) diff --git a/employee_late_check_in/security/ir.model.access.csv b/employee_late_check_in/security/ir.model.access.csv old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/check.png b/employee_late_check_in/static/description/assets/icons/check.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/chevron.png b/employee_late_check_in/static/description/assets/icons/chevron.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/cogs.png b/employee_late_check_in/static/description/assets/icons/cogs.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/consultation.png b/employee_late_check_in/static/description/assets/icons/consultation.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/ecom-black.png b/employee_late_check_in/static/description/assets/icons/ecom-black.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/education-black.png b/employee_late_check_in/static/description/assets/icons/education-black.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/hotel-black.png b/employee_late_check_in/static/description/assets/icons/hotel-black.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/license.png b/employee_late_check_in/static/description/assets/icons/license.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/lifebuoy.png b/employee_late_check_in/static/description/assets/icons/lifebuoy.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/manufacturing-black.png b/employee_late_check_in/static/description/assets/icons/manufacturing-black.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/pos-black.png b/employee_late_check_in/static/description/assets/icons/pos-black.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/puzzle.png b/employee_late_check_in/static/description/assets/icons/puzzle.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/restaurant-black.png b/employee_late_check_in/static/description/assets/icons/restaurant-black.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/service-black.png b/employee_late_check_in/static/description/assets/icons/service-black.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/trading-black.png b/employee_late_check_in/static/description/assets/icons/trading-black.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/training.png b/employee_late_check_in/static/description/assets/icons/training.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/update.png b/employee_late_check_in/static/description/assets/icons/update.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/user.png b/employee_late_check_in/static/description/assets/icons/user.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/icons/wrench.png b/employee_late_check_in/static/description/assets/icons/wrench.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/Cybrosys R.png b/employee_late_check_in/static/description/assets/misc/Cybrosys R.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/categories.png b/employee_late_check_in/static/description/assets/misc/categories.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/check-box.png b/employee_late_check_in/static/description/assets/misc/check-box.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/compass.png b/employee_late_check_in/static/description/assets/misc/compass.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/corporate.png b/employee_late_check_in/static/description/assets/misc/corporate.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/customer-support.png b/employee_late_check_in/static/description/assets/misc/customer-support.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/cybrosys-logo.png b/employee_late_check_in/static/description/assets/misc/cybrosys-logo.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/features.png b/employee_late_check_in/static/description/assets/misc/features.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/logo.png b/employee_late_check_in/static/description/assets/misc/logo.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/pictures.png b/employee_late_check_in/static/description/assets/misc/pictures.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/pie-chart.png b/employee_late_check_in/static/description/assets/misc/pie-chart.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/right-arrow.png b/employee_late_check_in/static/description/assets/misc/right-arrow.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/star.png b/employee_late_check_in/static/description/assets/misc/star.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/support.png b/employee_late_check_in/static/description/assets/misc/support.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/misc/whatsapp.png b/employee_late_check_in/static/description/assets/misc/whatsapp.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/modules/1.png b/employee_late_check_in/static/description/assets/modules/1.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/modules/2.png b/employee_late_check_in/static/description/assets/modules/2.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/modules/3.png b/employee_late_check_in/static/description/assets/modules/3.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/modules/4.png b/employee_late_check_in/static/description/assets/modules/4.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/modules/5.png b/employee_late_check_in/static/description/assets/modules/5.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/modules/6.png b/employee_late_check_in/static/description/assets/modules/6.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_1.png b/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_1.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_10.png b/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_10.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_2.png b/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_2.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_3.png b/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_3.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_4.png b/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_4.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_5.png b/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_5.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_6.png b/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_6.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_7.png b/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_7.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_8.png b/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_8.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_9.png b/employee_late_check_in/static/description/assets/screenshots/employee_late_check_in_9.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/assets/screenshots/hero.gif b/employee_late_check_in/static/description/assets/screenshots/hero.gif old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/banner.png b/employee_late_check_in/static/description/banner.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/icon.png b/employee_late_check_in/static/description/icon.png old mode 100644 new mode 100755 diff --git a/employee_late_check_in/static/description/index.html b/employee_late_check_in/static/description/index.html old mode 100644 new mode 100755 diff --git a/employee_late_check_in/views/hr_attendance_views.xml b/employee_late_check_in/views/hr_attendance_views.xml old mode 100644 new mode 100755 diff --git a/employee_late_check_in/views/hr_employee_views.xml b/employee_late_check_in/views/hr_employee_views.xml old mode 100644 new mode 100755 diff --git a/employee_late_check_in/views/hr_payslip_views.xml b/employee_late_check_in/views/hr_payslip_views.xml old mode 100644 new mode 100755 diff --git a/employee_late_check_in/views/late_check_in_views.xml b/employee_late_check_in/views/late_check_in_views.xml old mode 100644 new mode 100755 index 1188b0f80..2b2b8fde8 --- a/employee_late_check_in/views/late_check_in_views.xml +++ b/employee_late_check_in/views/late_check_in_views.xml @@ -74,7 +74,6 @@ - diff --git a/employee_late_check_in/views/res_config_settings_views.xml b/employee_late_check_in/views/res_config_settings_views.xml old mode 100644 new mode 100755 index 62f9217c3..793ec1d9a --- a/employee_late_check_in/views/res_config_settings_views.xml +++ b/employee_late_check_in/views/res_config_settings_views.xml @@ -1,20 +1,27 @@ - + Adding fields in res.config.settings - res.config.settings.view.form.inherit.employee.late.check.in + + res.config.settings.view.form.inherit.employee.late.check.in + res.config.settings - +

Late Check-in

- - + Deduction Amount + +
Amount to be deducted from payslip. @@ -25,27 +32,41 @@
- +

-