|
|
@@ -84,8 +84,8 @@ class ProjectDepreciationSheetExport implements WithEvents, WithTitle
|
|
|
$sheet->setCellValue("D{$currentRow}", $item['project_hours'] ?? 0);
|
|
|
$sheet->setCellValue("E{$currentRow}", ($item['ratio'] ?? 0) . '%');
|
|
|
$sheet->setCellValue("F{$currentRow}", $item['original_value'] ?? 0);
|
|
|
- $sheet->setCellValue("G{$currentRow}", $item['allocated_depreciatio'] ?? 0);
|
|
|
- $sheet->setCellValue("H{$currentRow}", $item['allocated_depreciatio'] ?? 0);
|
|
|
+ $sheet->setCellValue("G{$currentRow}", $item['allocated_depreciation'] ?? 0);
|
|
|
+ $sheet->setCellValue("H{$currentRow}", $item['allocated_depreciation'] ?? 0);
|
|
|
$sheet->setCellValue("I{$currentRow}", "");
|
|
|
$sheet->setCellValue("J{$currentRow}", $item['adjust_amount'] ?? 0);
|
|
|
|
|
|
@@ -115,8 +115,8 @@ class ProjectDepreciationSheetExport implements WithEvents, WithTitle
|
|
|
$total += ($item['total_hours'] ?? 0);
|
|
|
$totalProjectHours += ($item['project_hours'] ?? 0);
|
|
|
$totalOriginalValue += ($item['original_value'] ?? 0);
|
|
|
- $totalDepreciation += ($item['depreciation'] ?? 0);
|
|
|
- $totalConfirmedDepreciation += ($item['confirmed_depreciation'] ?? 0);
|
|
|
+ $totalDepreciation += ($item['allocated_depreciation'] ?? 0);
|
|
|
+ $totalConfirmedDepreciation += ($item['allocated_depreciation'] ?? 0);
|
|
|
$totalAdjustAmount += ($item['adjust_amount'] ?? 0);
|
|
|
}
|
|
|
|