From 4dbb92c34240aed0517a81acad2ebe23b722f2bc Mon Sep 17 00:00:00 2001 From: Horilla Date: Tue, 26 Mar 2024 14:18:37 +0530 Subject: [PATCH] [UPDT] PAYROLL: Updated payroll rembursment and loan account model by adding abstract class --- payroll/forms/forms.py | 5 +++-- payroll/views/views.py | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/payroll/forms/forms.py b/payroll/forms/forms.py index 41e04a54b..a0194a9ef 100644 --- a/payroll/forms/forms.py +++ b/payroll/forms/forms.py @@ -164,9 +164,9 @@ class WorkRecordForm(ModelForm): model = WorkRecord -class ReimbursementrequestCommentForm(ModelForm): +class ReimbursementRequestCommentForm(ModelForm): """ - ReimbursementrequestCommentForm form + ReimbursementRequestCommentForm form """ class Meta: @@ -176,6 +176,7 @@ class ReimbursementrequestCommentForm(ModelForm): model = ReimbursementrequestComment fields = ("comment",) + exclude = ["is_active"] class EncashmentGeneralSettingsForm(ModelForm): diff --git a/payroll/views/views.py b/payroll/views/views.py index 0b4096616..01d12f35f 100644 --- a/payroll/views/views.py +++ b/payroll/views/views.py @@ -1472,22 +1472,22 @@ def create_payrollrequest_comment(request, payroll_id): This method renders form and template to create Reimbursement request comments """ from payroll.forms.forms import ( - ReimbursementrequestCommentForm, + ReimbursementRequestCommentForm, ) payroll = Reimbursement.objects.filter(id=payroll_id).first() emp = request.user.employee_get - form = ReimbursementrequestCommentForm( + form = ReimbursementRequestCommentForm( initial={"employee_id": emp.id, "request_id": payroll_id} ) if request.method == "POST": - form = ReimbursementrequestCommentForm(request.POST) + form = ReimbursementRequestCommentForm(request.POST) if form.is_valid(): form.instance.employee_id = emp form.instance.request_id = payroll form.save() - form = ReimbursementrequestCommentForm( + form = ReimbursementRequestCommentForm( initial={"employee_id": emp.id, "request_id": payroll_id} ) messages.success(request, _("Comment added successfully!"))