a0fce2e0fb
Fixes #766
...
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
2015-04-29 16:14:08 -07:00
7d9c90f8dd
Only pull eula if set to use default in category
2015-04-01 08:51:40 +10:30
5d946b19cb
Fixed checkmodel at route level
2015-03-27 17:44:49 -07:00
605d0ed8e1
Moved checkModel into model from controller
2015-03-27 13:45:37 -07:00
35bbea3052
Fixes #688 - show model if no asset name
2015-03-24 17:08:15 -07:00
4243710378
Added location to new assets view
2015-03-14 01:30:12 -07:00
2244c60499
Added category to output
2015-03-13 20:32:47 -07:00
b2af86230a
Added fields
2015-03-12 19:52:03 -07:00
f27fb90457
Allow override of checkin/checkout date
...
TODO: fix error if someone enters non-date text
2015-03-04 18:59:45 -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
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
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
f57c61dd4d
Possible fix for #518 - license count issue
2015-02-12 12:25:22 -08:00
e343c157c5
Fixed naming conflict for requestable
2015-02-11 12:49:21 -08:00
35a133bbf9
Fixes #382 - allow admins to restore deleted assets
2015-02-11 04:44:39 -08:00
ab1c921443
Requestable assets views and controllers
2015-02-10 23:55:06 -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
5867c60410
Fixed scope chaining on assigned_to
2015-02-10 17:58:47 -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
614396a15b
Utilize query scopes for cleaner controllers
2015-02-08 16:02:35 -08:00
4b2e45c5f2
Added uploads methods
2015-02-06 18:41:35 -08:00
b4750f016d
Added new 4.2 SoftDeletingTrait
2015-02-04 15:50:40 -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
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
7c97477a53
Added default location to physical hardware
2014-10-16 17:41:56 -04:00
0dfc9660ca
alpha 0.4.0 release candidate
2014-08-11 17:13:43 +09:00
6cfb4ab5d8
0.4.0 release candidate
2014-08-11 13:10:00 +09:00
87c2a4c9c0
initial commit
2014-08-10 16:42:40 +09:00
b8a4c7e4d6
Initial COMMIT to set the file modified tracking. No changes made.
2014-08-05 13:22:08 +09:00
ac4c905c42
Fixed #140
2014-07-18 20:09:58 -04:00
ff61705a8f
More edits for #140
2014-07-17 13:38:53 -04:00
snipe