snipe
|
43c310c82d
|
Merge pull request #16531 from akemidx/bug/sc-28715
FIXED: Purchase Cost Column Always Shown
|
2025-04-30 15:54:31 +01:00 |
|
snipe
|
c46a9a773d
|
Fixed admin string
Signed-off-by: snipe <snipe@snipe.net>
|
2025-04-08 05:08:08 +01:00 |
|
akemidx
|
5944034b8b
|
moving warranty/depreciation to be with the other cost/eol values
|
2025-03-19 15:22:09 -04:00 |
|
akemidx
|
e408b902f0
|
removing depreciation from purchase cost (unneeded, should go elsewhere if wanted)
|
2025-03-18 16:38:44 -04:00 |
|
akemidx
|
a398c4ab84
|
reset
|
2025-03-18 16:37:27 -04:00 |
|
akemidx
|
27417cdec7
|
removing depreciation logic (unneeded for purchase cost)
|
2025-03-18 16:36:36 -04:00 |
|
Marcus Moore
|
a28ff22d03
|
Fix eol rate in ReportsController
|
2025-03-12 15:44:06 -07:00 |
|
snipe
|
115bb94704
|
Merge pull request #16156 from marcusmoore/acceptance-reminder-subject
Added "Reminder" to subject line of follow up asset checkout emails
|
2025-02-27 14:55:59 +00:00 |
|
snipe
|
5b0d7f4064
|
One more chonk
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-26 12:01:50 +00:00 |
|
snipe
|
2f6af10c5d
|
Bumped chunk for custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-26 11:59:34 +00:00 |
|
Marcus Moore
|
ab9e9b66d2
|
Reduce complexity
|
2025-01-29 16:27:18 -08:00 |
|
Marcus Moore
|
c15c338ffd
|
Merge if/else
|
2025-01-29 16:25:37 -08:00 |
|
Marcus Moore
|
e2805f4033
|
Add "Reminder" to subject line
|
2025-01-29 15:36:45 -08:00 |
|
snipe
|
ca11efd3ee
|
Merge pull request #16036 from Godmartinz/unaccepted_assets_reports_memory_fix
|
2025-01-13 22:23:30 +00:00 |
|
Godfrey M
|
92762896ef
|
moar removal
|
2025-01-07 15:10:46 -08:00 |
|
Godfrey M
|
c699baf519
|
removed commented out code, and unrelated crap
|
2025-01-07 15:10:00 -08:00 |
|
Godfrey M
|
97b765b5cc
|
improved reports query, could be further optimized
|
2025-01-07 15:06:09 -08:00 |
|
Marcus Moore
|
48dd3252cb
|
Fix parameter order
|
2025-01-07 11:47:16 -08:00 |
|
Godfrey M
|
e12c7473f8
|
tinkering with the polymorphic eager load
|
2025-01-07 09:08:36 -08:00 |
|
Godfrey M
|
0ec25d55a0
|
Merge branch 'develop' into unaccepted_assets_reports_memory_fix
|
2025-01-06 12:28:17 -08:00 |
|
Godfrey M
|
bb03e00279
|
fix deprecation on asset obs get unaccept report to populate
|
2025-01-06 11:26:45 -08:00 |
|
snipe
|
15296d2b1c
|
Merge pull request #15714 from akemidx/saving_custom_report_template
Saved Custom Report Templates
|
2024-12-19 22:43:59 +00:00 |
|
Godfrey M
|
f6b9ae6aee
|
missed a spot
|
2024-12-05 10:18:35 -08:00 |
|
Godfrey M
|
de41def2b3
|
fixed conditionals
|
2024-12-05 10:15:57 -08:00 |
|
Godfrey M
|
983b78edd9
|
add property check
|
2024-12-02 14:27:04 -08:00 |
|
Godfrey M
|
ab67c48352
|
fix unaccepted assets report resend acceptance
|
2024-12-02 13:03:09 -08:00 |
|
snipe
|
e8d1093376
|
Fixed admin user not showing in download all activity report
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-15 18:51:45 +00:00 |
|
Marcus Moore
|
b8265d54bb
|
Improve comment
|
2024-11-07 16:42:55 -08:00 |
|
Marcus Moore
|
3616c92148
|
Reflash template name
|
2024-10-23 15:40:54 -07:00 |
|
Marcus Moore
|
5ebf013d4e
|
Add comment
|
2024-10-22 16:54:38 -07:00 |
|
Marcus Moore
|
5306e1cd15
|
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/reports/custom.blade.php
|
2024-10-15 12:32:01 -07:00 |
|
Marcus Moore
|
8bba11e1bb
|
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
# app/Http/Controllers/ReportsController.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/status-select.blade.php
# resources/views/reports/custom.blade.php
|
2024-09-17 15:26:35 -07:00 |
|
akemidx
|
8e1111c681
|
Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports
|
2024-08-19 19:33:44 -04:00 |
|
snipe
|
d21ebc6f0d
|
Fixed return type
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-12 11:04:56 +01:00 |
|
snipe
|
96d1aea54a
|
More cleanup
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 00:54:50 +01:00 |
|
snipe
|
a1eafc108d
|
Moar typehinting
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 22:37:58 +01:00 |
|
snipe
|
ae9085b11f
|
Modernize use statements, switch to auth()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 20:49:22 +01:00 |
|
snipe
|
468674a517
|
Check that there is a depreciation date before formatting
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 11:07:41 +01:00 |
|
snipe
|
92ba889cae
|
Updated/removed facades
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 12:53:51 +01:00 |
|
snipe
|
fb233c0aa4
|
Cleaned up facade names and references
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 12:38:15 +01:00 |
|
snipe
|
a72d4e5dc1
|
Fixed ambiguous id clause in custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-04 14:23:58 +01:00 |
|
snipe
|
545a185614
|
Merge pull request #14262 from akemidx/bug/sc-24812
Last Checkin Date added to Hardware View and Index
|
2024-03-27 19:02:25 +00:00 |
|
Godfrey M
|
6c3a668400
|
checks to see if a user has an email before sending them a reminder email.
|
2024-03-05 10:30:24 -08:00 |
|
akemidx
|
eb0657c953
|
Merge branch 'develop' into bug/sc-24812
|
2024-02-28 17:22:16 -05:00 |
|
snipe
|
a52181c995
|
Merge pull request #14283 from akemidx/bug/sc-24788
FIXED: Checked in Assets Did Not Show in Custom Report when Selecting a Valid Checked Out Date
|
2024-02-28 11:47:46 +00:00 |
|
snipe
|
3351998efd
|
Only send notification if the item is assigned to a person
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-22 12:03:07 +00:00 |
|
snipe
|
cb5b691ec1
|
Check that the model exists before trying to access properties
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-19 15:34:57 +00:00 |
|
akemidx
|
4dd479dad7
|
formatting
|
2024-02-15 19:59:26 -05:00 |
|
akemidx
|
d01e1e8eeb
|
query works, but still only shows the asset once even if it's been checked out multiple times
|
2024-02-15 19:56:08 -05:00 |
|
akemidx
|
e3ef737ac4
|
query first go
|
2024-02-15 19:15:27 -05:00 |
|