From d569df01d1dd2dd64993333dd795a54bb4eb4980 Mon Sep 17 00:00:00 2001 From: Horilla Date: Mon, 20 Nov 2023 10:38:21 +0530 Subject: [PATCH] [UPDT] PAYROLL: Payslip creations and generate template method --- payroll/models/models.py | 2 +- payroll/templates/payroll/payslip/view_payslips.html | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/payroll/models/models.py b/payroll/models/models.py index 64ccfd14b..bf6162541 100644 --- a/payroll/models/models.py +++ b/payroll/models/models.py @@ -210,7 +210,7 @@ class Contract(models.Model): verbose_name=_("Deduction For One Leave Amount"), ) deduct_leave_from_basic_pay = models.BooleanField( - default=True, verbose_name=_("Deduct Leave From Basic Pay") + default=True, verbose_name=_("Deduct From Basic Pay") ) note = models.TextField(null=True, blank=True) diff --git a/payroll/templates/payroll/payslip/view_payslips.html b/payroll/templates/payroll/payslip/view_payslips.html index 261f6a9ac..cb69ed72d 100644 --- a/payroll/templates/payroll/payslip/view_payslips.html +++ b/payroll/templates/payroll/payslip/view_payslips.html @@ -404,8 +404,7 @@ history.pushState({ path: updatedUrl }, '', updatedUrl); } $(document).ready(function () { - $("form") - .not(".filter-form") + $(`[action="/payroll/create-payslip"], [action="/payroll/generate-payslip"]`) .submit(function (e) { e.preventDefault();