Merge branch 'hotfix/license-clone' into develop

# Conflicts: # app/Http/Controllers/ReportsController.php
2016-09-14 19:08:06 -07:00
parent 5846f23d8b f384593e19
commit b0a8a0427d
3 changed files with 5 additions and 4 deletions
@@ -792,7 +792,8 @@ class LicensesController extends Controller
        ->with('supplier_list', $supplier_list)
        ->with('license', $license)
        ->with('maintained_list', $maintained_list)
-        ->with('company_list', $company_list);
+        ->with('company_list', $company_list)
+        ->with('manufacturer_list', Helper::manufacturerList());

    }

@@ -109,8 +109,8 @@ class ReportsController extends Controller
            'model.manufacturer',
            'company'
        )
-            ->orderBy('created_at', 'DESC')
-            ->get();
+         ->orderBy('created_at', 'DESC')
+        ->get();

        return View::make('reports/asset', compact('assets'))->with('settings', $settings);
    }