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
aef3a734a3
Small fix for pending status
2015-02-10 16:06:24 -08:00
d2438f9fdb
Fixes #502 - normalized statuses
2015-02-10 15:57:19 -08:00
addfcd4bc5
Fix RTD bug
2015-02-09 20:02:40 -08:00
b360736b77
Fixes #484
2015-02-09 19:26:57 -08:00
c1600a33db
Fixes #499 - timestamps in asset logs
2015-02-09 16:47:36 -08:00
614396a15b
Utilize query scopes for cleaner controllers
2015-02-08 16:02:35 -08:00
3a9cb9ba7a
Display uploaded files
2015-02-06 21:31:16 -08:00
36fce27297
Added uploads methods
2015-02-06 18:41:47 -08:00
4b2e45c5f2
Added uploads methods
2015-02-06 18:41:35 -08:00
feeef4b66c
Fix for asset log incorrectly using soft deletes
2015-02-06 14:54:13 -08:00
b4750f016d
Added new 4.2 SoftDeletingTrait
2015-02-04 15:50:40 -08:00
d85e524680
Fixes #451 - allows spaces in state name
2015-01-22 14:29:53 -08:00
094ec50a68
TidyUp: Commonise the depreciate method of Asset and License.
2014-12-24 23:03:06 +00:00
98a29e460d
TidyUp: Remove excess whitespace.
2014-12-24 22:34:16 +00:00
dce1d47228
Updated language files
2014-12-23 14:48:43 -05:00
daefc86e58
Formattig fixes for #386
2014-11-21 06:10:30 -05:00
1b41c974cf
Fixes #348 - remove constraints on license keys
2014-11-20 18:43:33 -05:00
d6a0249c60
Fixed #373 - added ability to auto-increment asset tags
2014-11-20 18:28:45 -05:00
b73ae3147a
Fixes #362 , reduced asset name to 2 char min
2014-11-13 16:26:39 -05:00
432e348e56
Add Report Controller and License Report
2014-11-12 12:02:55 +10:30
1047c5c8bb
Update Settings to contain PHP & Laravel versions
2014-11-06 11:12:15 +10:30
7833d10006
Add Fields to Licenses and Update Supplier for Licenses
2014-11-06 09:32:50 +10:30
Brady Wetherington