[ADD] PAYROLL: company_id - Company dependent fields to payroll models

This commit is contained in:
Horilla
2023-11-20 14:30:02 +05:30
parent b6824c8ca2
commit 73f4174057
2 changed files with 6 additions and 4 deletions

View File

@@ -12,7 +12,7 @@ from django.db.models.signals import pre_save, pre_delete
from django.http import QueryDict
from employee.models import EmployeeWorkInformation
from employee.models import Employee, Department, JobPosition
from base.models import EmployeeShift, WorkType, JobRole
from base.models import Company, EmployeeShift, WorkType, JobRole
from attendance.models import (
validate_time_format,
)
@@ -82,7 +82,7 @@ class FilingStatus(models.Model):
blank=True,
verbose_name=_("Description"),
)
company_id = models.ForeignKey(Company,null=True, editable=False, on_delete=models.PROTECT)
objects = models.Manager()
def __str__(self) -> str:
@@ -804,6 +804,7 @@ class Allowance(models.Model):
if_amount = models.FloatField(
default=0.00, help_text=_("The amount of the pay-head")
)
company_id = models.ForeignKey(Company,null=True, editable=False, on_delete=models.PROTECT)
objects = models.Manager()
class Meta:
@@ -1092,7 +1093,7 @@ class Deduction(models.Model):
if_amount = models.FloatField(
default=0.00, help_text=_("The amount of the pay-head")
)
company_id = models.ForeignKey(Company,null=True, editable=False, on_delete=models.PROTECT)
objects = models.Manager()
def clean(self):

View File

@@ -10,6 +10,7 @@ from django.core.exceptions import ValidationError
from django.db import models
from django.utils.text import format_lazy
from django.utils.translation import gettext_lazy as _
from base.models import Company
from payroll.models.models import FilingStatus
@@ -19,6 +20,7 @@ class PayrollSettings(models.Model):
Payroll settings model"""
currency_symbol = models.CharField(null=True, default="$", max_length=5)
company_id = models.ForeignKey(Company,null=True, editable=False, on_delete=models.PROTECT)
objects = models.Manager()
def __str__(self):
@@ -44,7 +46,6 @@ class TaxBracket(models.Model):
min_income = models.FloatField(null=False, blank=False,verbose_name=_("Min. Income"))
max_income = models.FloatField(null=True, blank=True,verbose_name=_("Max. Income"))
tax_rate = models.FloatField(null=False, blank=False, default=0.0,verbose_name=_("Tax Rate"))
objects = models.Manager()
def __str__(self):