From 06de6aac105b3fff8d1fa42de8568c1d0adbcabe Mon Sep 17 00:00:00 2001 From: Horilla Date: Tue, 26 Mar 2024 14:14:35 +0530 Subject: [PATCH] [UPDT] PAYROLL: Updated tax bracket model by adding abstract class --- base/translator.py | 7 +++++ payroll/forms/tax_forms.py | 2 ++ payroll/models/tax_models.py | 20 ++++--------- .../payroll/tax/filing_status_creation.html | 8 +++-- .../payroll/tax/filing_status_edit.html | 2 +- .../payroll/tax/filing_status_empty.html | 10 ++----- .../payroll/tax/filing_status_list.html | 8 ++--- .../payroll/tax/filing_status_view.html | 30 ++----------------- .../payroll/tax/tax_bracket_creation.html | 22 +------------- .../payroll/tax/tax_bracket_edit.html | 2 +- .../payroll/tax/tax_bracket_view.html | 5 ++-- 11 files changed, 32 insertions(+), 84 deletions(-) diff --git a/base/translator.py b/base/translator.py index 5e5580112..cf312cef8 100644 --- a/base/translator.py +++ b/base/translator.py @@ -317,3 +317,10 @@ _("employee-tag-view"), _("grace-settings-view"), _("helpdesk-tag-view"), _("feedback-answer-view"), +_("requested"), +_("approved"), +_("cancelled"), +_("rejected"), +_("true"), +_("false"), + diff --git a/payroll/forms/tax_forms.py b/payroll/forms/tax_forms.py index ea3ffbdcc..854997a71 100644 --- a/payroll/forms/tax_forms.py +++ b/payroll/forms/tax_forms.py @@ -92,6 +92,7 @@ class FilingStatusForm(ModelForm): model = FilingStatus fields = "__all__" + exclude = ["is_active"] class TaxBracketForm(ModelForm): @@ -102,6 +103,7 @@ class TaxBracketForm(ModelForm): model = TaxBracket fields = "__all__" + exclude = ["is_active"] widgets = { "filing_status_id": forms.Select( attrs={"class": "oh-select oh-select-2 select2-hidden-accessible"} diff --git a/payroll/models/tax_models.py b/payroll/models/tax_models.py index 7bc631dd5..ee2c459ea 100644 --- a/payroll/models/tax_models.py +++ b/payroll/models/tax_models.py @@ -11,10 +11,11 @@ from django.utils.text import format_lazy from django.utils.translation import gettext_lazy as _ from base.models import Company +from horilla.models import HorillaModel from payroll.models.models import FilingStatus -class PayrollSettings(models.Model): +class PayrollSettings(HorillaModel): """ Payroll settings model""" @@ -34,7 +35,7 @@ class PayrollSettings(models.Model): return super().save(*args, **kwargs) -class TaxBracket(models.Model): +class TaxBracket(HorillaModel): """ TaxBracket model """ @@ -85,14 +86,14 @@ class TaxBracket(models.Model): tax_rate=self.tax_rate, ).exclude(pk=self.pk) if existing_bracket.exists(): - raise ValidationError("This tax bracket already exists") + raise ValidationError(_("This tax bracket already exists")) if self.max_income is None: self.max_income = math.inf if self.min_income >= self.max_income: raise ValidationError( - {"max_income": "Maximum income must be greater than minimum income."} + {"max_income": _("Maximum income must be greater than minimum income.")} ) existing_brackets = TaxBracket.objects.filter( @@ -112,14 +113,3 @@ class TaxBracket(models.Model): ) } ) - - -# class FederalTax(models.Model): -# """ -# FederalTax models -# """ - -# filing_status_id = models.ForeignKey( -# FilingStatus, models.CASCADE, verbose_name=_("Filing Status") -# ) -# taxable_gross = models.IntegerField(null=False, blank=False) diff --git a/payroll/templates/payroll/tax/filing_status_creation.html b/payroll/templates/payroll/tax/filing_status_creation.html index 7dc1d09e5..231176c57 100644 --- a/payroll/templates/payroll/tax/filing_status_creation.html +++ b/payroll/templates/payroll/tax/filing_status_creation.html @@ -24,14 +24,16 @@ data-dismiss="oh-modal" aria-label="Close" data-toggle="oh-modal-toggle" - hx-get="{% url 'filing-status-search' %}" - hx-target="#FilingStatusList" + {% if messages %} + hx-get="{% url 'filing-status-search' %}" + hx-target="#FilingStatusList" + {% endif %} >
{% csrf_token %} {{ form.as_p }}
diff --git a/payroll/templates/payroll/tax/filing_status_edit.html b/payroll/templates/payroll/tax/filing_status_edit.html index 959539f60..9b5cdc77f 100644 --- a/payroll/templates/payroll/tax/filing_status_edit.html +++ b/payroll/templates/payroll/tax/filing_status_edit.html @@ -31,7 +31,7 @@ {% csrf_token %} {{ form.as_p }}
diff --git a/payroll/templates/payroll/tax/filing_status_empty.html b/payroll/templates/payroll/tax/filing_status_empty.html index 7d77b7d9b..c16b26ad7 100644 --- a/payroll/templates/payroll/tax/filing_status_empty.html +++ b/payroll/templates/payroll/tax/filing_status_empty.html @@ -13,9 +13,9 @@
{% trans "Create" %}
@@ -23,12 +23,6 @@
- -
{% trans "Create" %} @@ -62,10 +62,10 @@ {% trans "Update" %} diff --git a/payroll/templates/payroll/tax/filing_status_view.html b/payroll/templates/payroll/tax/filing_status_view.html index 3657806cb..eefe39d4c 100644 --- a/payroll/templates/payroll/tax/filing_status_view.html +++ b/payroll/templates/payroll/tax/filing_status_view.html @@ -45,9 +45,9 @@ {% trans "Create" %} @@ -78,32 +78,6 @@ {% endif %}
- - -{% endcomment %} diff --git a/payroll/templates/payroll/tax/tax_bracket_edit.html b/payroll/templates/payroll/tax/tax_bracket_edit.html index e2a51c6c9..1db721080 100644 --- a/payroll/templates/payroll/tax/tax_bracket_edit.html +++ b/payroll/templates/payroll/tax/tax_bracket_edit.html @@ -33,7 +33,7 @@ {% csrf_token %} {{ form.as_p }}
diff --git a/payroll/templates/payroll/tax/tax_bracket_view.html b/payroll/templates/payroll/tax/tax_bracket_view.html index 4c450ac4b..bdbad6079 100644 --- a/payroll/templates/payroll/tax/tax_bracket_view.html +++ b/payroll/templates/payroll/tax/tax_bracket_view.html @@ -37,10 +37,9 @@