nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPDT] HORILLA: Bring up changes/fix from the master branch

Browse Source
This commit is contained in:
Horilla
2025-07-04 14:52:39 +05:30
parent b0e067a95b
commit e9f4756e89
33 changed files with 481 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
project/models.py
View File

@@ -236,9 +236,6 @@ class Project(HorillaModel):
def __str__(self):
return self.title
def status_column(self):
return dict(self.PROJECT_STATUS).get(self.status)
class Meta:
"""
Meta class to add the additional info
@@ -540,7 +537,7 @@ class TimeSheet(HorillaModel):
on_delete=models.CASCADE,
verbose_name=_("Employee"),
)
date = models.DateField(default=timezone.now)
date = models.DateField(default=timezone.now, verbose_name=_("Date"))
time_spent = models.CharField(
null=True,
default="00:00",
@@ -635,5 +632,5 @@ class TimeSheet(HorillaModel):
return url
class Meta:
verbose_name = _("TimeSheet")
verbose_name_plural = _("TimeSheets")
verbose_name = _("Time Sheet")
verbose_name_plural = _("Time Sheets")