43cdace9de
Merge remote-tracking branch 'origin/develop'
2015-02-17 19:18:10 -08:00
a04af4aead
Bumped version number
2015-02-17 19:17:53 -08:00
e7eec42ab8
Merge pull request #532 from uberbrady/depreciation_refactor
...
Depreciation refactor
2015-02-17 18:55:52 -08:00
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
38961298ed
Fixes #439 - loads javascript and CSS locally
2015-02-17 15:29:57 -08:00
ea6a6d098a
Fixes #440 - removed unique constraint on serial
2015-02-17 14:15:22 -08:00
1f0f9c2441
Merge remote-tracking branch 'origin/develop'
2015-02-16 20:50:41 -08:00
d4fbea3571
Merge remote-tracking branch 'origin/develop'
2015-02-16 20:49:55 -08:00
b32d74de57
Fixed seeder with duplicate ID
2015-02-16 19:56:11 -08:00
4e4144ea74
Fixed blade reference
2015-02-16 19:43:22 -08:00
7b331b26d3
Language string for nothing updated on bulk update
2015-02-16 18:27:27 -08:00
e02bea4275
Fixes #457 - added bulk options to hardware
2015-02-16 18:21:29 -08:00
24f5cdc743
Fixes #523 - added file uploads to assets
2015-02-16 13:49:51 -08:00
08ee02d0cd
Fixes #525 - added serial to asset model UI
2015-02-16 13:12:57 -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
4a5007264e
Fixed mac address not showing
2015-02-12 21:34:20 -08:00
bd01b11f4f
Merge pull request #519 from madd15/patch-2
...
Fix #517 - User Requestable Assets
2015-02-12 13:21:48 -08:00
064c0211db
Fix #517 - User Requestable Assets
2015-02-13 07:50:47 +10:30
4cb931a93b
Merge remote-tracking branch 'origin/develop'
2015-02-12 12:50:15 -08:00
3df8243d80
Updated composer to include mockery
2015-02-12 12:49:57 -08:00
f57c61dd4d
Possible fix for #518 - license count issue
2015-02-12 12:25:22 -08:00
7a4f115cb3
Merge remote-tracking branch 'origin/develop'
2015-02-11 22:57:47 -08:00
58ff929d71
Fixes error when no model present because new asset
2015-02-11 22:57:22 -08:00
49f25a23a9
Merge pull request #516 from splaer/fix-475
...
Fix 475
2015-02-11 21:42:33 -08:00
bcf75073ec
Update style
...
updated the scss as well until that starts getting auto compiled
2015-02-12 00:38:58 -05:00
6908456d09
Merge remote-tracking branch 'origin/develop'
2015-02-11 21:27:56 -08:00
c26369f8cc
Added spacing between buttons
2015-02-11 21:21:19 -08:00
56e090f3e7
Unlink username if they've been deleted
2015-02-11 21:19:18 -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
823e0c8562
Merge remote-tracking branch 'origin/develop'
2015-02-11 16:55:29 -08:00
95be7908f8
New language strings
2015-02-11 16:51:16 -08:00
c660c71556
Added MAC address to view
2015-02-11 16:43:46 -08:00
fbf03b225d
Fixes #509 - added MAC address as model option
2015-02-11 16:37:24 -08:00
a5f4c51ab2
Merge remote-tracking branch 'origin/develop'
2015-02-11 14:31:25 -08:00
89dce89035
Moved expiration date below purchase date
2015-02-11 14:02:34 -08:00
8cdd215614
Fixed intenting
2015-02-11 14:02:21 -08:00
342a8b81af
Fix for error when asset has null status
2015-02-11 13:51:28 -08:00
cd5a352961
Fix for wrong math on remaining licenses when assigned to an asset
2015-02-11 13:39:08 -08:00
a451fa1fa6
Merge remote-tracking branch 'origin/develop'
2015-02-11 12:49:39 -08:00
e343c157c5
Fixed naming conflict for requestable
2015-02-11 12:49:21 -08:00
37fc216c5a
Additional language strings
2015-02-11 05:19:23 -08:00
96feb84fd4
Merge remote-tracking branch 'origin/develop'
2015-02-11 04:59:35 -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
snipe