 Brady Wetherington
|
c683c1c57e
|
Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"
This reverts commit 41b711740a, reversing
changes made to 55309bfaef.
It also un-reverts reversions that were done inadvertently.
|
2015-07-20 17:12:28 -07:00 |
|
|
snipe
|
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 |
|
|
snipe
|
919df7ed56
|
Part of #863 - adds order number to asset listing
|
2015-07-16 19:54:56 -07:00 |
|
|
snipe
|
2d10931d6c
|
Use league/csv for export
|
2015-07-08 23:42:17 -07:00 |
|
|
snipe
|
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 |
|
|
Vincent Sposato
|
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 |
|
|
Vincent Sposato
|
269f73205a
|
Built the report and the export for the Improvements report
Added the links on the navigation
|
2015-06-28 15:00:55 -04:00 |
|
|
snipe
|
c95af84452
|
Fixes #750 because @uberbrady can't code
|
2015-04-30 17:14:31 -07:00 |
|
|
snipe
|
767e2c69f3
|
Fixes #751 - ignore whether depreciation was selected or not to display purchase cost
|
2015-04-29 16:31:38 -07:00 |
|
|
snipe
|
d61506fcf7
|
Fixes for #766 - add activity report
|
2015-04-29 14:50:12 -07:00 |
|
|
madd15
|
f33844d4af
|
move status around to match view
|
2015-03-13 13:01:30 +10:30 |
|
|
snipe
|
8eaa70c39b
|
Fixes #567 - bug in depreciation report csv export
|
2015-02-26 00:21:48 -08:00 |
|
|
snipe
|
6905d82fc4
|
Fixes #374 to keep the requirement to PHP 5.4
|
2014-11-20 16:38:50 -05:00 |
|
|
Madd15
|
89c7159c56
|
Fix array check for empty rows
|
2014-11-13 08:29:15 +10:30 |
|
|
Madd15
|
57ec8aa3c2
|
Add error for no options selected
|
2014-11-13 08:02:25 +10:30 |
|
|
Madd15
|
6d2a073d04
|
Custom Asset Report
|
2014-11-12 16:05:59 +10:30 |
|
|
Madd15
|
02605bdf69
|
Add Asset Report with Reduced Load Time
|
2014-11-12 12:03:33 +10:30 |
|
|
Madd15
|
432e348e56
|
Add Report Controller and License Report
|
2014-11-12 12:02:55 +10:30 |
|