Ivan Nieto Vivanco
|
92df32dfaa
|
Move a couple assignation of variables inside an else to only execute once
|
2023-08-15 21:10:48 -06:00 |
|
Ivan Nieto Vivanco
|
993918f47c
|
Add query to search into the per-component view
|
2023-08-15 15:31:36 -06:00 |
|
snipe
|
e41368daac
|
Merge pull request #12050 from cram42/develop
New Label Engine
|
2023-08-15 17:58:57 +01:00 |
|
Robert-Azelis
|
07bafa9508
|
Update CompaniesController.php
|
2023-08-13 17:15:20 +02:00 |
|
Grant Le Roux
|
b1464e028c
|
Merge branch 'develop' into develop
|
2023-07-31 07:57:29 +08:00 |
|
Ivan Nieto Vivanco
|
0a841ddbb8
|
Change component validator to the correct asset id we're passing in the API call
|
2023-07-27 20:22:13 -06:00 |
|
Ivan Nieto Vivanco
|
c015264181
|
Adjust the license offset if it exceeds the total of license seats
|
2023-07-25 16:23:33 -06:00 |
|
snipe
|
18e2ec4dad
|
Merge pull request #13310 from marcusmoore/bug/sc-23478
Fixed the inability to load location select when editing profile
|
2023-07-18 13:26:30 +01:00 |
|
snipe
|
f51dd15893
|
Moved deleted scope down
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-14 07:44:19 +01:00 |
|
Marcus Moore
|
346ace9444
|
Allow users that have permission to edit their own location to see locations in select list
|
2023-07-13 17:37:46 -07:00 |
|
snipe
|
981c3a430d
|
Merge pull request #13301 from uberbrady/better_auto_increment_tags
Better auto increment asset-tags [FD-32892]
|
2023-07-13 09:49:44 +01:00 |
|
Brady Wetherington
|
76191a09ed
|
Improvements to asset_tag auto-incrementing, with auto-fixups for gaps
|
2023-07-12 16:39:45 +01:00 |
|
snipe
|
14c61e4c17
|
Added phone, fax to departments, locations, companies
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 19:44:21 +01:00 |
|
snipe
|
4c3a306a6e
|
More shuffling of scopes
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 13:35:41 +01:00 |
|
Marcus Moore
|
3cb0920411
|
Merge branch 'develop' into company-scoping
|
2023-06-26 12:32:10 -07:00 |
|
snipe
|
78d8e32a22
|
Fixed weird order number thing
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-22 21:16:24 +01:00 |
|
Marcus Moore
|
8aae5beaba
|
Add explicit select back to query
|
2023-06-22 13:09:08 -07:00 |
|
Marcus Moore
|
a8133f62e8
|
Add explicit select back to query
|
2023-06-22 13:07:49 -07:00 |
|
Marcus Moore
|
ab5fed09db
|
Remove scopeCompanyables call from AssetsController@requestable
|
2023-06-22 12:36:43 -07:00 |
|
Marcus Moore
|
0a5e1e3190
|
Remove scopeCompanyables call from AssetsController@selectlist
|
2023-06-21 17:21:36 -07:00 |
|
Marcus Moore
|
fd55c99b87
|
Remove scopeCompanyables call from AssetsController@index
|
2023-06-21 16:29:44 -07:00 |
|
snipe
|
5d4e704fac
|
Added a comment
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-21 09:26:54 +01:00 |
|
snipe
|
2d9ddab3f0
|
Moved logic for tighter constraints when ids are passed
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-21 09:24:17 +01:00 |
|
Godfrey M
|
ee50906e44
|
attempt to add warranty to api controller
|
2023-06-13 11:20:55 -07:00 |
|
Marcus Moore
|
8e6e525b47
|
Remove scopeCompanyables call from LicensesController
|
2023-06-07 16:09:45 -07:00 |
|
Marcus Moore
|
a18f5e7fc0
|
Remove scopeCompanyables call from ConsumablesController
|
2023-06-07 14:22:22 -07:00 |
|
Marcus Moore
|
48850f3597
|
Remove scopeCompanyables call from ComponentsController
|
2023-06-06 18:02:18 -07:00 |
|
Ivan Nieto Vivanco
|
086265455d
|
Pass user count to the eloquent query
|
2023-05-23 11:53:09 -06:00 |
|
snipe
|
f9449aa81f
|
Merge pull request #13069 from marcusmoore/fixes/add-eager-load-to-asset-model-endpoint
Add eager loading to Asset Models controller
|
2023-05-22 14:39:32 -07:00 |
|
Marcus Moore
|
a6eeae6541
|
Eager load fieldset default values in asset model endpoint
|
2023-05-22 14:19:03 -07:00 |
|
snipe
|
02cacf76c6
|
Additional multi-select options for custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-16 13:58:21 -07:00 |
|
snipe
|
5960a5425d
|
Pass filename to pre-import backup
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 14:48:26 -07:00 |
|
snipe
|
6486ea4fb7
|
Merge pull request #12976 from inietov/fixes/validate_soft-deleted_models_in_asset_model
Refactor of #12955
|
2023-05-08 13:14:02 -07:00 |
|
snipe
|
8b73fa0053
|
Added missing use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-06 06:36:09 -07:00 |
|
Ivan Nieto Vivanco
|
fbb7c55450
|
Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models
|
2023-05-04 03:12:36 -06:00 |
|
snipe
|
fc53b56481
|
Merge pull request #12955 from inietov/fixes/error_500_after_sign_and_accept_asset
Fixed Error 500 after sign and accept asset
|
2023-05-03 11:43:14 -07:00 |
|
snipe
|
b716f9f55e
|
Merge pull request #12916 from snipe/features/auto_add_to_fieldset
Added ability to auto-add fields to new fieldsets
|
2023-05-03 11:04:33 -07:00 |
|
snipe
|
ea17fdeba5
|
Merge pull request #12846 from snipe/features/livewire_location_import
Location importer via Livewire Importer
|
2023-05-03 11:02:06 -07:00 |
|
Ivan Nieto Vivanco
|
1b2d830380
|
Check if model exists before create asset via API
|
2023-05-01 16:05:03 -06:00 |
|
Marcus Moore
|
3cae32b236
|
Eager load default locations
|
2023-04-27 17:13:09 -07:00 |
|
snipe
|
54a766c4f9
|
Added dynamic warranty URL to manufacturers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 16:39:15 -07:00 |
|
snipe
|
8f0b823fb3
|
Applies #12868
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 23:39:32 -07:00 |
|
snipe
|
22d73f503a
|
Merge pull request #12756 from dboth/develop
Fixed #8208, #8896, #8985 and #9789: Currency issues when using non-english locales (resubmission)
|
2023-04-25 22:32:13 -07:00 |
|
snipe
|
15dc4e4779
|
Added fieldset sync
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:29:57 -07:00 |
|
snipe
|
087f0e596a
|
Fixed has to where
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 22:44:05 -07:00 |
|
snipe
|
99cecee4b5
|
Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui
|
2023-04-17 14:54:30 -07:00 |
|
snipe
|
16ab2bec06
|
Added sorting and searching on autoassign_licenses via user API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 15:27:39 -07:00 |
|
snipe
|
64256351d8
|
Used a singleton to filter API limit value
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 08:46:39 -07:00 |
|
snipe
|
78ec21acc4
|
Added location case
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 07:47:49 -07:00 |
|
snipe
|
955539807c
|
Merge pull request #12830 from snipe/features/adds_supplier_id_to_components
Added supplier to components and consumables
|
2023-04-15 18:42:23 -07:00 |
|