3ebbd030e7
Fixed issue with Asset model
2015-08-07 18:52:19 -04:00
7ae226635f
First rough pass at asset acceptance report
2015-08-07 18:50:55 -04:00
66991ea663
Fixes #1018 - allow name re-use if deleted
2015-08-05 13:57:04 -07:00
41127bf5dd
Added scope to the Asset model to pull all assets that belonged to a list of models
2015-08-01 12:14:21 -04:00
f9c7022bcc
Add checkin_email()
2015-07-24 12:01:21 +09:30
d1d6fe26a6
Fixed all issues that were reported by @leobg
...
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-20 21:34:19 -04:00
e479575825
Added all of the functionality for the Improvement to be linked to the Asset
2015-07-20 21:11:17 -04:00
1c4190bf22
Added the relation to the improvement to the model, so that we can reference these items
2015-07-20 21:02:21 -04:00
c683c1c57e
Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"
...
This reverts commit 41b711740a55309bfaef
2015-07-20 17:12:28 -07:00
41b711740a
Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking
...
# Conflicts:
# app/controllers/admin/ReportsController.php
# app/lang/en/general.php
# app/routes.php
# app/views/backend/hardware/view.blade.php
# app/views/backend/layouts/default.blade.php
# composer.lock
2015-07-20 16:12:35 -07:00
4a5066054b
Display bugfixes for #819
2015-07-08 22:38:35 -07:00
84ffc1a728
Migration for location-specific currency, updated views for #819
...
This isn't done yet though. All kinds of busted stuff.
2015-07-08 20:35:40 -07:00
74429d9075
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/lang/en/general.php
# app/start/artisan.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/layouts/default.blade.php
2015-07-08 18:07:53 -07:00
de23ec5785
Fixes #544 - disable checking an asset out to a user if it is not a deployable status
2015-07-08 17:18:46 -07:00
7da7907fbd
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-06 19:29:06 -07:00
f855bfd4ef
Better error checking for eol data
2015-07-06 14:09:48 -07:00
1b423f5b54
Fixed all issues that were reported by @leobg
...
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-06 10:36:54 -04:00
7d5810b656
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/config/version.php
# app/controllers/admin/AssetsController.php
2015-07-02 17:23:06 -07:00
552bdfdc2d
Switched defaultLoc to belongsTo relationship
2015-07-02 16:51:52 -07:00
c90ea92a4e
Added all of the functionality for the Improvement to be linked to the Asset
2015-06-27 14:37:40 -04:00
3a86c53b49
Added the relation to the improvement to the model, so that we can reference these items
2015-06-27 12:27:15 -04:00
fc1e8a4e4e
Minor comment tweak
2015-06-23 15:05:21 -07:00
94f8c61720
Fixes #280 , #64 and #860 - added license expiration alert
2015-06-23 01:52:06 -07:00
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
Vincent Sposato