fix: use task work order data in service report context
Some checks failed
ERP CI/CD Pipeline / test (push) Has been cancelled
ERP CI/CD Pipeline / Deploy (server git pull + compose) (push) Has been cancelled

Ensure /putni-nalozi/racuni reads service-report context from the selected task's own work order instead of reusing the parent page work-order data for every task.

- task-service-context now returns task_work_order metadata per task
- work hours modal reads location and travel data from task_work_order
- tasks without a linked work order fall back to None

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
mariomitte
2026-08-06 19:53:40 +02:00
parent 18c65a6f84
commit ed71bf500f
2 changed files with 18 additions and 2 deletions

View File

@@ -3464,6 +3464,22 @@ class WorkOrderViewSet(viewsets.ModelViewSet):
'service_report_note': task.service_report_note or '',
'assigned_to_name': _user_display_name(task.assigned_to),
'vehicle_registration': getattr(task.vehicle, 'registration_number', None),
'task_work_order': (
{
'id': task.work_order_id,
'display_code': getattr(task.work_order, 'display_code', None),
'origin_location': getattr(task.work_order, 'origin_location', None),
'location': getattr(task.work_order, 'location', None),
'travel_start_at': getattr(task.work_order, 'travel_start_at', None),
'travel_end_at': getattr(task.work_order, 'travel_end_at', None),
'start_mileage': getattr(task.work_order, 'start_mileage', None),
'end_mileage': getattr(task.work_order, 'end_mileage', None),
'distance': getattr(task.work_order, 'distance', None),
'servicer_vehicle_registration': getattr(task.work_order, 'servicer_vehicle_registration', None),
'servicer_vehicle_make_model': getattr(task.work_order, 'servicer_vehicle_make_model', None),
}
if task.work_order_id else None
),
'work_hours_table': getattr(getattr(task, 'work_hours_table', None), 'data', None),
'service_records': records_payload,
})

View File

@@ -554,8 +554,8 @@ export default function WorkOrderInvoicesPdfPage() {
<TaskWorkHoursTableModal
open={!!editingTask}
task={editingTask}
workOrder={workOrder}
defaultLocation={workOrder?.location || ''}
workOrder={editingTask?.task_work_order ?? null}
defaultLocation={editingTask?.task_work_order?.location ?? ''}
saving={savingWorkHours}
onClose={() => setEditingTask(null)}
onSave={handleSaveWorkHoursTable}