admin/38156-vm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ver 15.07 fix project on adjustments (claude fix)

Browse Source
This commit is contained in:
Flatlogic Bot 2026-02-21 23:26:23 +00:00
parent fe7d0d6a70
commit 4ef75c9e8d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/__pycache__/views.cpython-311.pyc
View File

Binary file not shown.

3
core/models.py
View File

@ -168,7 +168,8 @@ class PayrollAdjustment(models.Model):
worker = models.ForeignKey(Worker, on_delete=models.CASCADE, related_name='adjustments')
payroll_record = models.ForeignKey(PayrollRecord, on_delete=models.SET_NULL, null=True, blank=True, related_name='adjustments')
loan = models.ForeignKey(Loan, on_delete=models.SET_NULL, null=True, blank=True, related_name='repayments')
work_log = models.ForeignKey(WorkLog, on_delete=models.SET_NULL, null=True, blank=True, related_name='adjustments')
work_log = models.ForeignKey(WorkLog, on_delete=models.SET_NULL, null=True, blank=True, related_name='adjustments'
project = models.ForeignKey(Project, on_delete=models.SET_NULL, null=True, blank=True, related_name='adjustments'
amount = models.DecimalField(max_digits=10, decimal_places=2, help_text="Positive adds to pay, negative subtracts (except for Loan Repayment which is auto-handled)")
date = models.DateField(default=timezone.now, db_index=True)

6
core/views.py
View File

@ -394,7 +394,7 @@ def work_log_list(request):
logs = logs.filter(paid_in__isnull=True)
# --- 2. Fetch Adjustments ---
adjustments = PayrollAdjustment.objects.all().select_related('worker', 'payroll_record', 'work_log')
adjustments = PayrollAdjustment.objects.all().select_related('worker', 'payroll_record', 'work_log', 'work_log__project')
if worker_id:
adjustments = adjustments.filter(worker_id=worker_id)
@ -497,7 +497,7 @@ def work_log_list(request):
'type': 'ADJ',
'date': adj.date,
'obj': adj,
'project_name': f"{adj.get_type_display()}", # Use project column for Type
'project_name': f"{adj.get_type_display()} ({adj.work_log.project.name})" if adj.work_log and getattr(adj.work_log, 'project', None) else f"{adj.get_type_display()}", # Use project column for Type
'team_name': None,
'workers': [adj.worker],
'supervisor': "System",
@ -637,7 +637,7 @@ def export_work_log_csv(request):
logs = logs.filter(paid_in__isnull=True)
# --- 2. Fetch Adjustments ---
adjustments = PayrollAdjustment.objects.all().select_related('worker', 'payroll_record', 'work_log')
adjustments = PayrollAdjustment.objects.all().select_related('worker', 'payroll_record', 'work_log', 'work_log__project')
if worker_id:
adjustments = adjustments.filter(worker_id=worker_id)