From 25f2ea3239c5f230e8d112e5430df66758645abe Mon Sep 17 00:00:00 2001 From: Horilla Date: Fri, 24 May 2024 20:34:13 +0530 Subject: [PATCH] [UPDT] PAYROLL: Updated contract,allowance & deduction hx request functions --- payroll/forms/component_forms.py | 3 ++- payroll/views/component_views.py | 11 ++++++++++- payroll/views/views.py | 11 ++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/payroll/forms/component_forms.py b/payroll/forms/component_forms.py index 3862b149a..e72825141 100644 --- a/payroll/forms/component_forms.py +++ b/payroll/forms/component_forms.py @@ -17,6 +17,7 @@ from base.forms import Form, ModelForm from base.methods import reload_queryset from employee.filters import EmployeeFilter from employee.models import BonusPoint, Employee +from horilla.decorators import logger from horilla_widgets.forms import HorillaForm from horilla_widgets.widgets.horilla_multi_select_field import HorillaMultiSelectField from horilla_widgets.widgets.select_widgets import HorillaMultiSelectWidget @@ -98,7 +99,7 @@ class AllowanceForm(forms.ModelForm): condition.save() multiple_conditions.append(condition) except Exception as e: - print(e) + logger(e) if commit: self.instance.other_conditions.add(*multiple_conditions) return multiple_conditions diff --git a/payroll/views/component_views.py b/payroll/views/component_views.py index 4ffc6d03c..2a3764280 100644 --- a/payroll/views/component_views.py +++ b/payroll/views/component_views.py @@ -25,7 +25,12 @@ from base.backends import ConfiguredEmailBackend from base.methods import closest_numbers, filter_own_records, get_key_instances, sortby from base.models import Company from employee.models import Employee, EmployeeWorkInformation -from horilla.decorators import login_required, owner_can_enter, permission_required +from horilla.decorators import ( + hx_request_required, + login_required, + owner_can_enter, + permission_required, +) from leave.models import AvailableLeave from notifications.signals import notify from payroll.filters import ( @@ -292,6 +297,7 @@ def view_single_allowance(request, allowance_id): @login_required +@hx_request_required @permission_required("payroll.view_allowance") def filter_allowance(request): """ @@ -341,6 +347,7 @@ def update_allowance(request, allowance_id, **kwargs): @login_required +@hx_request_required @permission_required("payroll.delete_allowance") def delete_allowance(request, allowance_id): """ @@ -460,6 +467,7 @@ def view_single_deduction(request, deduction_id): @login_required +@hx_request_required @permission_required("payroll.view_allowance") def filter_deduction(request): """ @@ -507,6 +515,7 @@ def update_deduction(request, deduction_id, **kwargs): @login_required +@hx_request_required @permission_required("payroll.delete_deduction") def delete_deduction(request, deduction_id, emp_id=None): instances_ids = request.GET.get("instances_ids") diff --git a/payroll/views/views.py b/payroll/views/views.py index 85179e5d3..2fcbbfd21 100644 --- a/payroll/views/views.py +++ b/payroll/views/views.py @@ -29,7 +29,12 @@ from base.methods import ( ) from base.models import Company from employee.models import Employee, EmployeeWorkInformation -from horilla.decorators import login_required, owner_can_enter, permission_required +from horilla.decorators import ( + hx_request_required, + login_required, + owner_can_enter, + permission_required, +) from notifications.signals import notify from payroll.context_processors import get_active_employees from payroll.filters import ContractFilter, ContractReGroup, PayslipFilter @@ -120,6 +125,7 @@ def contract_update(request, contract_id, **kwargs): @login_required +@hx_request_required @permission_required("payroll.change_contract") def contract_status_update(request, contract_id): from payroll.forms.forms import ContractForm @@ -197,6 +203,7 @@ def update_contract_filing_status(request, contract_id): @login_required +@hx_request_required @permission_required("payroll.delete_contract") def contract_delete(request, contract_id): """ @@ -256,6 +263,7 @@ def contract_view(request): @login_required +@hx_request_required @owner_can_enter("payroll.view_contract", Contract) def view_single_contract(request, contract_id): """ @@ -299,6 +307,7 @@ def view_single_contract(request, contract_id): @login_required +@hx_request_required @permission_required("payroll.view_contract") def contract_filter(request): """