Godfrey M
|
49342a4542
|
added status names to asset history
|
2023-12-05 11:50:43 -08:00 |
|
snipe
|
6a3ab526de
|
Refactorer API controller restore methods
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-22 18:04:24 +00:00 |
|
snipe
|
aab7eb4a85
|
Merge pull request #13800 from snipe/fixes/bulk_edit_assets
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
|
2023-10-26 15:56:47 +01:00 |
|
snipe
|
7b2f49644e
|
Use nothing instead of null to make it consistent
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-26 14:44:17 +01:00 |
|
snipe
|
305cd9b0b8
|
Use null instead of blank
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-26 14:42:49 +01:00 |
|
snipe
|
64219da0b4
|
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements
|
2023-10-26 13:36:18 +01:00 |
|
snipe
|
c1213e0abc
|
Nicer handling for empty custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-26 09:41:44 +01:00 |
|
snipe
|
ff72c4fbaa
|
Added nicer formatting for fields in log meta
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-26 09:17:28 +01:00 |
|
snipe
|
ab3edae0b6
|
Reverted buttons (this re-introduces the n+1 problem.)
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-25 19:43:09 +01:00 |
|
snipe
|
23a6547ada
|
Added custom fields, fixed n+1
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-25 17:28:14 +01:00 |
|
Robert-Azelis
|
5ae09b791f
|
Update AssetsTransformer.php
on list of assets display EOL rate in months if purchase date and eol date are set, otherwise null (not display anything)
|
2023-10-22 18:16:49 +02:00 |
|
snipe
|
a92a9d7616
|
Removed duplicated deleted
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-13 19:53:11 +01:00 |
|
snipe
|
8f23a45cb3
|
Removed dummy text
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-13 19:49:03 +01:00 |
|
snipe
|
93cccf4f5f
|
Handle case where value is deleted in history
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-13 19:32:09 +01:00 |
|
snipe
|
eea2eabaee
|
Escaping asset history old/new values
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-06 19:45:23 +01:00 |
|
snipe
|
6fa0d42bc2
|
Fixed bug where license checkout/checkin notes were not being saved
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 15:40:18 +01:00 |
|
snipe
|
ee72c92d4f
|
Fix for asset history with enfrypted fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 03:00:49 +01:00 |
|
Godfrey Martinez
|
a26b96185b
|
Merge branch 'develop' into asset-model-notifs
|
2023-09-11 09:37:22 -07:00 |
|
Godfrey M
|
0eb50ceb3d
|
removes commented code
|
2023-09-11 09:36:38 -07:00 |
|
snipe
|
e486fe2794
|
Removed soft-delete query
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-05 16:10:20 +01:00 |
|
snipe
|
f85df6bb8c
|
Use same method of accessing companies as others
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-05 16:02:28 +01:00 |
|
snipe
|
2acf2b880e
|
Account for hard-deleted models, suppliers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-05 15:58:21 +01:00 |
|
Godfrey Martinez
|
d86c63cf23
|
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable
|
2023-08-28 19:38:16 -07:00 |
|
Godfrey M
|
74f45a4473
|
reworks company queries for asset history
|
2023-08-28 19:35:46 -07:00 |
|
Godfrey Martinez
|
92e88a0ae2
|
Merge branch 'develop' into ignore_encrypt_and_other_changes
|
2023-08-28 10:14:41 -07:00 |
|
Godfrey M
|
18cb514a53
|
revert unwanted changes
|
2023-08-24 10:40:44 -07:00 |
|
Godfrey M
|
a3b6e0fbe6
|
adds some spacing
|
2023-08-24 10:36:09 -07:00 |
|
Godfrey M
|
34ba0c4440
|
adds id to history info
|
2023-08-24 10:36:08 -07:00 |
|
Godfrey M
|
739fc152c2
|
Adds readable asset history in the action log transformer
|
2023-08-24 10:36:08 -07:00 |
|
Godfrey M
|
8ebb9afedd
|
adds min_amt to asset model edit, index, and table
|
2023-08-24 10:30:07 -07:00 |
|
Marcus Moore
|
e32c07be02
|
Clear commented log statements
|
2023-08-24 08:15:40 -07:00 |
|
Marcus Moore
|
5a0b0522b0
|
Explicitly declare $clean_meta variable
|
2023-08-24 08:15:07 -07:00 |
|
Godfrey Martinez
|
28cf533d19
|
Merge branch 'develop' into ignore_encrypt_and_other_changes
|
2023-08-23 00:42:59 -07:00 |
|
Godfrey M
|
0fc79ec936
|
fixes conflicts
|
2023-08-23 00:40:59 -07:00 |
|
Godfrey M
|
ffe1b11419
|
merged develop
|
2023-08-23 00:38:58 -07:00 |
|
Godfrey M
|
27488c1009
|
adds soft deletes to eager loading
|
2023-08-23 00:34:09 -07:00 |
|
Godfrey M
|
ce60db009c
|
adds soft deletes to eager loading
|
2023-08-23 00:32:43 -07:00 |
|
Marcus Moore
|
bee680683d
|
Add withTrashed to asset model query
|
2023-08-22 17:05:06 -07:00 |
|
Godfrey M
|
92ddf8fc67
|
removed dead space
|
2023-08-22 12:38:50 -07:00 |
|
Godfrey M
|
1019287c76
|
retarget key
|
2023-08-22 12:36:43 -07:00 |
|
Godfrey M
|
9e438c3ed0
|
eager loaded changedInfo queries, reworked encrypted data change log changes
|
2023-08-22 12:34:45 -07:00 |
|
Godfrey M
|
c7f2acf2c6
|
removes encrypted info from change log, renames asset_eol_date in the change log
|
2023-08-22 11:39:38 -07:00 |
|
snipe
|
a48762c64d
|
Merge pull request #13496 from snipe/features/setting_for_name_order
Fixed #13495 added setting for name order
|
2023-08-22 12:50:58 +01:00 |
|
snipe
|
303b45c9e9
|
Merge pull request #13485 from Godmartinz/history_info_clean_up
Added better handling of information of asset history
|
2023-08-22 12:25:17 +01:00 |
|
Godfrey M
|
b54aaefefb
|
adds some spacing
|
2023-08-21 13:43:06 -07:00 |
|
Godfrey M
|
5076b45a0d
|
adds id to history info
|
2023-08-21 13:40:39 -07:00 |
|
snipe
|
f3460b5a4f
|
Switch to getFullNameAttribute() in user transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:10:48 +01:00 |
|
snipe
|
ffc7c4e99a
|
use number format to constrain large number displays
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-18 22:18:09 +01:00 |
|
Godfrey M
|
a62876d4bc
|
Adds readable asset history in the action log transformer
|
2023-08-17 16:14:01 -07:00 |
|
snipe
|
e41368daac
|
Merge pull request #12050 from cram42/develop
New Label Engine
|
2023-08-15 17:58:57 +01:00 |
|