Commit Graph

39 Commits

Author SHA1 Message Date
Abdullah Alansari e66e2e42d3 Use global scope for companyable children 2015-11-19 08:42:17 +03:00
Abdullah Alansari 177fadba8a Add better scoping for companayable children 2015-11-19 07:41:32 +03:00
Abdullah Alansari 08781a561b Fix: use global scope for companies support
Use Eloquent ORM global scope instead of using
Company::scopeCompanayables() all over the place.

In addition, this makes it harder to for a user
that is assigned to a company to access unauthorized
assets through other entities (e.g: license seats)
2015-11-18 16:49:34 +03:00
Abdullah Alansari b202e01205 Add full multiple companies support
Added as an option in settings.
When enabled, users (including admins) who are assigned
to companies have access only to their companies' assets.
2015-11-16 06:03:27 +03:00
Daniel Dreier 8ad220701e Fixes Purchase Cost not showing up on custom reports 2015-10-21 20:24:07 -05:00
snipe 1d976ff926 Fixes #1078 2015-08-19 10:23:01 -07:00
root b576fce1f7 Modified files for accessory report. 2015-08-11 16:35:18 -07:00
Vincent Sposato 3ebbd030e7 Fixed issue with Asset model 2015-08-07 18:52:19 -04:00
Brady Wetherington 7ae226635f First rough pass at asset acceptance report 2015-08-07 18:50:55 -04:00
Vincent Sposato afbe23c214 Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query
Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur
Removed the artisan command
2015-08-07 18:50:55 -04:00
snipe 449ad4f86b Fixes #1014 - error if no assets are unaccepted 2015-08-04 13:22:13 -07:00
Vincent Sposato 24edf81b27 Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport 2015-08-01 12:29:29 -04:00
Vincent Sposato b195934a4a Finished building out the report, and refactoring to make the code more expressive
Need to finish writing the code to track threads
2015-08-01 12:20:49 -04:00
Vincent Sposato 794dc5998a Working on the Actionlog and ReportsController - still having issues getting data back the way I want 2015-08-01 12:20:48 -04:00
Vincent Sposato 8f68bdb318 Working through getting the dataset correctly from the asset logs so that we can generate a report 2015-08-01 12:17:13 -04:00
Vincent Sposato e560cc2ee2 Working on the Actionlog and ReportsController - still having issues getting data back the way I want 2015-07-31 19:29:44 -04:00
Vincent Sposato 8c30c5d879 Fixed issue in routes file 2015-07-29 19:09:32 -04:00
Vincent Sposato 130a041be0 Added Carbon to the uses statement for reports controller 2015-07-20 21:42:07 -04:00
Vincent Sposato a7a2f5f974 Minor change to reports controller to include the View facade 2015-07-20 21:41:29 -04:00
Vincent Sposato 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
Vincent Sposato 3df0550b19 Built the report and the export for the Improvements report
Added the links on the navigation
2015-07-20 21:26:23 -04:00
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