Merge branch 'hotfixes/purchase_order' into develop

# Conflicts:
#	app/Http/Controllers/LicensesController.php
This commit is contained in:
snipe 2016-09-27 01:31:02 -07:00
commit c42dfadd17

View file

@ -214,6 +214,7 @@ class License extends Depreciable
->orWhere('serial', 'LIKE', '%'.$search.'%')
->orWhere('notes', 'LIKE', '%'.$search.'%')
->orWhere('order_number', 'LIKE', '%'.$search.'%')
->orWhere('purchase_order', 'LIKE', '%'.$search.'%')
->orWhere('purchase_date', 'LIKE', '%'.$search.'%')
->orWhere('purchase_cost', 'LIKE', '%'.$search.'%');
});