4b92cdf684
Use the same values/calculations in the view as the index. Should fix #1140 I believe
2015-12-23 20:32:48 -05:00
50be3eed4a
Fix Two issues with Asset Maintenance.
...
1) If a start and end date were given when creating an asset, asset_maintenance_time was not set.
2) AssetMaintenancesController::getDataTable would return 'time' instead of 'asset_maintenance_time', causing the field not to display.
2015-12-23 20:02:20 -05:00
3b7da8f379
Fix consumable count in categories. This adds new methods to Category, consumables consumablesCount and a generic count. It also refactors CatgoriesController to use the count method rather than having it determine the category type.
2015-12-23 20:02:09 -05:00
9eee73d2e5
I accidentallyied a bracket.
2015-12-22 16:24:21 -05:00
e272cab82f
Add Company name to Asset Importer. Tested on one set of data.
2015-12-22 16:13:30 -05:00
5967dbae64
Company helper, updated bulk view to show model number
2015-12-22 11:39:42 -08:00
f42a3c8918
Added company to bulk edit
2015-12-22 11:12:26 -08:00
d3b3ed0d16
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-12-22 10:56:37 -08:00
894579314c
s/([Qq])uanitity/\1uantity/g
2015-12-22 11:11:11 -05:00
b76f014669
Better handling for invalid locations
2015-12-22 02:40:31 -08:00
f03d1cd4cc
Simplified currency display until we can fix it on a broader level
2015-12-22 00:25:30 -08:00
0c27717c20
Added check and error message for trying to accept an asset that was not
...
checked out to that user.
2015-12-18 14:51:51 -06:00
ce1565a545
Re-commented mac address - bad merge :-/
2015-12-18 12:08:08 -05:00
ac5527e7d3
Merge branch 'hotfixes/custom_reports_fix' into develop
2015-12-18 12:06:35 -05:00
865468d091
Fix for location error
2015-12-18 12:06:11 -05:00
b20f4d245e
Fixes #1494 - uncommented mac_address fields
2015-12-17 20:09:47 -05:00
927c368235
Fix for weird location info in asset report
2015-12-17 19:37:20 -05:00
eacd4ee2b0
Fix for bad data in asset report
2015-12-17 18:59:58 -05:00
8dab50edc6
Fixes #1498 - better regex for characters in custom field name
2015-12-17 18:19:35 -05:00
ee097dd1da
Bumped version
2015-12-15 05:36:04 -08:00
775ea95458
Fix inability to edit models (unique constraint)
2015-12-15 05:35:14 -08:00
73f0a19adb
Fixes #1459 - fieldset_id error if null
2015-12-15 05:34:54 -08:00
a68cbcf767
Fixes #1472 - only fire DB seeder if the user inputs 'y'
2015-12-15 05:24:15 -08:00
5c698d7cfd
Fixes #1469 - don't require currency at model level
2015-12-15 05:17:44 -08:00
efc06f4b31
Bumped version
2015-12-15 04:15:51 -08:00
cac254ded6
Fixes #1371 - problem saving new models with non-latin characters
2015-12-15 04:15:28 -08:00
e217d354dc
Fixed bug in strict mode for fieldsets
2015-12-15 04:14:19 -08:00
e1837069da
Allow bulk model update for #1462 , fixes #1442
2015-12-09 20:35:24 -08:00
eb83d9c486
Add header banner if app is running in production mode with debug on
2015-12-09 16:37:34 -08:00
25338c00e5
Fixes #1456 - email notification when asset requested
2015-12-09 01:40:13 -08:00
599ea20d65
Fixes #1449 - full link to order number
2015-12-09 01:06:25 -08:00
72f3b459c5
Merge branch 'hotfixes/user_import_company_id' into develop
...
Conflicts:
app/config/version.php
2015-12-08 23:00:27 -08:00
c34c9438da
Bumped version
2015-12-08 22:59:33 -08:00
3d8733c612
Comment out company ID for now until we can handle it more smartly
2015-12-08 22:59:22 -08:00
cab1642ead
Small extra logging for LDAP
2015-12-08 21:06:54 -08:00
b1e48b7054
More debugging
2015-12-03 13:33:28 -08:00
2686dd640c
Additional debugging info
2015-12-03 13:30:56 -08:00
bb7b8f3964
Show error if LDAP failed and local auth failed because user doesn't exist
2015-12-03 04:14:05 -08:00
5bed0bd7ed
Fixes #1437 - set expected checkout correctly
2015-12-03 03:14:29 -08:00
be3c8e4515
Fixes #1440 - make employee number searchable/sortable
2015-12-03 02:07:20 -08:00
784d1995d8
Added auth login log note
2015-12-03 02:06:34 -08:00
7802af837b
One more fix for LDAP and local users working together
2015-12-02 22:47:22 -08:00
6f8a76246e
LDAP fix for local users
2015-12-02 21:22:56 -08:00
66e9203b97
Save fieldset on create
2015-12-02 19:21:09 -08:00
b41461698d
Fix for error on asset create
2015-12-02 19:03:08 -08:00
8cdb032a14
Fixes error messages, and re-filling old input on failed asset create
2015-12-02 17:57:28 -08:00
3417d833ba
Save on create for custom fields
2015-12-02 17:12:17 -08:00
aff7b99d91
Nicer add/edit formatting putting required fields at the top
2015-12-02 16:31:57 -08:00
3944553bfc
Commented out show_mac_address field in model creation
2015-12-02 16:11:45 -08:00
3dc79197c3
Fix for LDAP error if username is wrong
2015-12-02 15:59:01 -08:00
Daniel Meltzer