Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
SamDudley committed Nov 19, 2024
1 parent 2cafd35 commit a37a92d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 27 deletions.
25 changes: 0 additions & 25 deletions gifthospitality/migrations/0007_data_test_multiple_concurrent.py

This file was deleted.

5 changes: 3 additions & 2 deletions payroll/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Employee(models.Model):
fte = models.FloatField(default=1.0)
assignment_status = models.CharField(max_length=32)

# TODO: Missing fields from Admin Tool
# TODO: Missing fields from Admin Tool which aren't required yet.
# EU/Non-EU (from programme code model)

objects = EmployeeQuerySet.as_manager()
Expand Down Expand Up @@ -95,7 +95,8 @@ class Meta:
period_10 = models.BooleanField(default=True)
period_11 = models.BooleanField(default=True)
period_12 = models.BooleanField(default=True)
# FIXME

# TODO: Missing fields from Admin Tool which aren't required yet.
# capital (Real colour of money)
# recharge = models.CharField(max_length=50, null=True, blank=True)
# recharge_reason = models.CharField(max_length=100, null=True, blank=True)
Expand Down
1 change: 1 addition & 0 deletions payroll/services/payroll.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ def get_payroll_data(
budget_type=obj.programme_code.budget_type.budget_type_display,
assignment_status=obj.assignment_status,
basic_pay=obj.basic_pay,
# `first` is OK as there should only be one `pay_periods` with the filters.
pay_periods=obj.pay_periods.first().periods,
)

Expand Down

0 comments on commit a37a92d

Please sign in to comment.