DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 15:44:11 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
997 commits 97 branches 266 tags 291 MiB
Commit graph

40 commits

Author SHA1 Message Date
snipe e4140f4c48 Fixes #2817 - adds EOL to custom report 2016-10-27 14:20:55 -07:00
snipe 691f9b621e Fixes #2821 2016-10-26 11:27:37 -07:00
snipe f30631efb6 Fixed parens on target 2016-10-25 12:53:07 -07:00
snipe b839741069 Merge branch 'hotfixes/order_number_numeric' into develop 2016-10-19 15:03:05 -07:00
Daniel Meltzer 85af8e46e3 Set a user_id of -1 if there isn't a logged in user. This fixes the CLI importer, and opens the door in the future for some sort of virtual importer user... which may fix other issues the importer currently has (#2775) 2016-10-17 11:07:08 -07:00
snipe 31898d0f85 Fixes #2751 - asset tag added to asset maintenance report 2016-10-12 14:18:51 -07:00
Daniel Meltzer 8e60767c00 Guard against null values in the reports generator. May fix #2758 (#2762) 2016-10-12 12:06:38 -07:00
Matthias Frei 4b6ba6cb30 BugFix: Asset name was not included in custom report (#2733) 
* BugFix: Asset name was not included in custom report

* BugFix: Custom Asset Report did not escape commas in custom fields. So the csv file is inconsistent, if a custom field containes a comma.  Added an escape function which escapes the commas with a backslash.
A csvreader can be configured to handle the escape character.
 2016-10-12 12:05:49 -07:00
Daniel Meltzer 2a95a95e00 Company to logs (#2717) 
* Fix the actionlog/companyables problem by adding a company_id to all actionlogs and scoping directly on that.  Works around bugs in laravel where trying to hunt down the polymorphic relationship would lead to an infinite loop

* Scope companyables in getactivityreport.  Also eager load.

* Improve reportscontroller, work on seeder to test this.

* Only show company users in checkout dialogs

* If no admin associated with log, it might be a request.  Leave blank instead of saying deleted admin

* When injecting company_id, use target instead of user if user is a superadmin

* Build up the seeder to generate users, companies, and logs.

* Eager load the log, don't scope the users log because the log should already include things only related to the user.
 2016-09-29 22:20:49 -07:00
snipe b41883c125 Use user object to prevent errors on deleted users 2016-09-29 11:37:38 -07:00
snipe 0a218a37d0 Check that the user exists before trying to get location id 2016-09-29 10:32:09 -07:00
Brady Wetherington 7ca7877740 Fix mismerged code. (#2705) 2016-09-28 22:57:19 -07:00
snipe fc07753a5c Use $customfields in closure 2016-09-28 19:18:01 -07:00
snipe 67f199b09d Added customfields to asset CSV export 2016-09-27 15:09:47 -07:00
snipe f1c458185d Client-side pagination on asset report for faster loading 2016-09-27 14:56:05 -07:00
snipe fa72e64b98 Add checkout date to asset report 2016-09-27 08:42:48 -07:00
snipe 2a8ab06ca3 Remove escaping for CSV to prevent weird encoding 2016-09-27 07:25:28 -07:00
snipe 61d07bdc7c Sigh. 2016-09-27 07:24:26 -07:00
snipe 3061ce2983 Missed delimiter for CSV 2016-09-27 07:23:30 -07:00
snipe e9f3d622f5 Add company name to custom asset report 2016-09-27 07:19:52 -07:00
snipe d3d36315d3 Hotfixes adding company name to custom report 2016-09-20 00:49:08 -07:00
snipe 5e2dbaffc4 Use streaming to handle large exports 2016-09-12 14:06:55 -07:00
Daniel Meltzer 9bf3403f31 Fix #2499 (#2500) 
Missed this instance when renaming the method. Sorry!
 2016-08-26 06:01:58 -07:00
Daniel Meltzer 5959f83de3 Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better. 2016-08-16 20:47:53 -05:00
Daniel Meltzer 0c912bcf49 Fix more number_format madness. 
This does two main things:
1) The importer now imports as numbers, not parsed strings.  This allows
is to format values on output instead of input, which is what was
happening in most places.

2) Add a Helper::parseCurrencyString method and port everything to use
this.  This checks to see if the value is numeric or empty, and returns
the appropriate value in all cases.  Should fix all known occurances of
number_format expections.
 2016-08-16 20:41:28 -05:00
snipe fff2bce9e4 Added missing username in header row 2016-08-02 15:16:01 -07:00
snipe 75e0c5565c Add username and custom fields option to custom report 2016-08-02 15:04:10 -07:00
snipe 4ed8ff5576 Formatting fixes for coding standards 2016-06-22 12:27:41 -07:00
snipe b0b7cfa999 Better handling for show/hide columns in depreciation report 2016-05-18 16:06:29 -07:00
snipe 7ee13113e0 Add depreciation name and months to depreciation report 2016-05-18 15:59:54 -07:00
snipe ba01b20ad4 Use updated redirect() reference 2016-04-28 21:06:41 -07:00
snipe 3e84d66c80 Re-use settings to prevent 1001 queries 2016-04-19 06:11:20 -07:00
snipe d601db2090 Updated docs 2016-04-07 17:08:38 -07:00
snipe bf728da39d Updated to use 5.2 trans() instead of Lang::get for localization 2016-04-07 13:39:35 -07:00
snipe a62859dc6d Updated docblocks 2016-04-07 13:21:09 -07:00
snipe 90d4a8b2e3 Cleanup namespaces a bit 2016-03-25 19:26:22 -07:00
snipe e7405e8d89 Coding is still hard, apparently. 2016-03-25 18:51:44 -07:00
snipe bddb7fca23 Additional doc blocks, added private_uploads path 2016-03-25 15:50:08 -07:00
snipe 27543d16f6 Additional escaping 2016-03-25 15:24:12 -07:00
snipe fe00b0e401 Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00