Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit c758355df995 · 2025-04-30T16:14:34.000+01:00
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
@@ -485,7 +485,7 @@ public function postCustom(CustomAssetReportRequest $request) : StreamedResponse
                 $header[] = trans('admin/hardware/table.purchase_date');
             }
 
-            if (($request->filled('purchase_cost')) || ($request->filled('depreciation'))) {
+            if ($request->filled('purchase_cost')) {
                 $header[] = trans('admin/hardware/table.purchase_cost');
             }
 

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ public function postCustom(CustomAssetReportRequest $request) : StreamedResponse`
`485`	`485`	`$header[] = trans('admin/hardware/table.purchase_date');`
`486`	`486`	`}`
`487`	`487`
`488`		`- if (($request->filled('purchase_cost')) \|\| ($request->filled('depreciation'))) {`
	`488`	`+ if ($request->filled('purchase_cost')) {`
`489`	`489`	`$header[] = trans('admin/hardware/table.purchase_cost');`
`490`	`490`	`}`
`491`	`491`