04735f1aff
Fixed assetlog display
2015-02-26 17:04:21 -08:00
231e465898
Added category types to view
2015-02-26 16:00:52 -08:00
afe2eb736c
Added category type
2015-02-26 15:48:44 -08:00
c0c563b1c7
Fixes accessory relationshop for pivot
2015-02-26 15:25:08 -08:00
430b8233ed
Fixed user relationship
2015-02-26 15:24:51 -08:00
4ef2dd0c7e
Remove unused trashedAssets()
2015-02-27 08:42:53 +10:30
5010720a97
Fixed accessory relationship
2015-02-26 14:07:52 -08:00
efaf067b94
Fixed user relationship
2015-02-26 14:07:39 -08:00
6efd268004
Disable checkouts if there are none left
2015-02-26 13:28:08 -08:00
ad30aebcbc
Methods to extend the category EULA to the accessory
2015-02-26 11:41:47 -08:00
97d97fc4df
Merge branch 'develop' of github.com:snipe/snipe-it into develop
...
Conflicts:
app/views/backend/categories/edit.blade.php
app/views/backend/depreciations/edit.blade.php
app/views/backend/groups/create.blade.php
app/views/backend/groups/edit.blade.php
app/views/backend/hardware/bulk.blade.php
app/views/backend/hardware/checkin.blade.php
app/views/backend/hardware/checkout.blade.php
app/views/backend/hardware/edit.blade.php
app/views/backend/licenses/checkin.blade.php
app/views/backend/licenses/checkout.blade.php
app/views/backend/licenses/edit.blade.php
app/views/backend/locations/edit.blade.php
app/views/backend/manufacturers/edit.blade.php
app/views/backend/models/edit.blade.php
app/views/backend/statuslabels/edit.blade.php
app/views/backend/suppliers/edit.blade.php
app/views/frontend/account/change-email.blade.php
app/views/frontend/account/change-password.blade.php
app/views/frontend/account/profile.blade.php
app/views/frontend/auth/forgot-password-confirm.blade.php
app/views/frontend/auth/signin.blade.php
2015-02-26 10:26:04 -08:00
9f3edd701b
Fixes #565 - Soft Delete Models and Allow Restore
...
Allow models to be deleted and restored which in turn allows deleted
hardware to function when model is deleted.
2015-02-26 22:35:57 +10:30
54bad2e4f6
More accessory relationships
2015-02-26 03:19:45 -08:00
e41621def0
Fixed relation between accessory and category
2015-02-26 03:08:27 -08:00
3ba6e45011
Added Accessories scaffolding
2015-02-25 16:31:22 -08:00
525a9225c8
Dashboard
2015-02-25 16:30:59 -08:00
ad39ec1dc3
Added markdown to EULA
2015-02-25 11:25:10 -08:00
097bb38a23
Fixes #163 - accept acceptance + eula
...
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
2015-02-24 22:15:36 -08:00
cb51dc45b6
Extend report to 60 days
2015-02-24 03:49:22 -08:00
e04ac89c5a
Added expiring warrantee alerts
2015-02-24 02:07:33 -08:00
70ae59ed62
Fixed a bug when no assets are in table that the autoincrement method blows up. Also optimzed the logic to get max id instead of popping top off creation date.
2015-02-19 12:52:27 -05:00
ae104293da
#539 - Allow checked out asset in requestable
2015-02-19 08:20:27 +10:30
063e5c407c
Fixed the depreciation report, fixes to calculate current depreciated
...
value (which were only used there). Additional fixes and refactoring
around Depreciable, in terms of how assets get depreciation via models,
and licenses get depreciation directly.
2015-02-17 18:51:13 -08:00
3ba02b65fb
Oops - Assets get their Depreciation from their *model* - wheras
...
Licenses have a Depreciation directly associated with them. So I
pulled the Depreciation relationship out of Depreciable so that both
Assets and Licenses could pull their depreciations in their associated
ways. I could've done this with an inheritance call, but that seems
a bit much (and unnecessarily confusing).
2015-02-17 17:56:59 -08:00
88dc0700f0
Make date functions work; create negative intervals for depreciation,
...
Also renamed "months_until_depreciation" to "time_until_depreciation"
And renamed Depreciatable to Depreciable (which is an actual word in
English.) Also a cleanup/consistency-enforcement for interval display.
2015-02-17 17:40:16 -08:00
899e2bc9b6
Not convinved this filename is right or anything, but the shared depreciation code is here
2015-02-17 17:40:16 -08:00
1e4071b51d
First stab at cleaning up Depreciation
...
Conflicts:
app/models/Asset.php
It looks like the same time I pulled depreciation out of the
Asset class, uploads were being added in. It doesn't look
like a conflict to me, but git couldn't figure it out. Oh Well.
2015-02-17 17:39:39 -08:00
ea6a6d098a
Fixes #440 - removed unique constraint on serial
2015-02-17 14:15:22 -08:00
24f5cdc743
Fixes #523 - added file uploads to assets
2015-02-16 13:49:51 -08:00
ec1ab6913e
Merged layout blades for unified nav
2015-02-16 12:55:32 -08:00
f40bb7b8b3
Fixes #520 postal code requirement
2015-02-13 11:40:28 -08:00
17258b73a1
Fixes #520 - state no longer required
2015-02-13 11:37:47 -08:00
f57c61dd4d
Possible fix for #518 - license count issue
2015-02-12 12:25:22 -08:00
00f7717142
Fix #475 and styling
...
Cleaned up styling to break lines with larger notes on hardware view
and asset view. Changed column type to text.
2015-02-11 23:38:59 -05:00
8cdd215614
Fixed intenting
2015-02-11 14:02:21 -08:00
cd5a352961
Fix for wrong math on remaining licenses when assigned to an asset
2015-02-11 13:39:08 -08:00
e343c157c5
Fixed naming conflict for requestable
2015-02-11 12:49:21 -08:00
80e10c4c98
Fixes #387 - sortable asset view by manufacturer
2015-02-11 04:57:59 -08:00
35a133bbf9
Fixes #382 - allow admins to restore deleted assets
2015-02-11 04:44:39 -08:00
c89be34503
Fixes #329 and #454 - added category asset view
2015-02-11 03:51:01 -08:00
d9d99b2223
No trashed
2015-02-11 00:44:22 -08:00
ab1c921443
Requestable assets views and controllers
2015-02-10 23:55:06 -08:00
7b165a12e0
Fixes #508 - compacted UI for licenses overview
2015-02-10 21:52:11 -08:00
f72b385790
Fix licenses so null instead of 0
2015-02-10 20:46:58 -08:00
9bcc9a7ed1
Check not deleted
2015-02-10 18:27:00 -08:00
7715731c4a
Fix count in header
2015-02-10 18:26:35 -08:00
0aa4d2a3db
Added undeployable as allowed validation type
2015-02-10 18:06:55 -08:00
5867c60410
Fixed scope chaining on assigned_to
2015-02-10 17:58:47 -08:00
1b93c5538a
Get trashed for admins
2015-02-10 17:41:19 -08:00
31f4ba88f6
Fix RTD query to not display checked out asset
2015-02-11 11:49:28 +10:30
snipe