Merge branch 'refs/heads/develop'

Author: snipe

app/controllers/admin/LicensesController.php

@@ -312,7 +312,7 @@ public function postCheckin($seatId)
 		if (is_null($licenseseat = LicenseSeat::find($seatId)))
 		{
 			// Redirect to the asset management page with error
-			return Redirect::to('admin/licenses')->with('error', Lang::get('admin/assets/message.not_found'));
+			return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
 		}
 
 		$logaction = new Actionlog();
@@ -331,11 +331,11 @@ public function postCheckin($seatId)
 			$log = $logaction->logaction('checkin from');
 
 			// Redirect to the new asset page
-			return Redirect::to("admin/licenses")->with('success', Lang::get('admin/licenses/message.checkout.success'));
+			return Redirect::to("admin/licenses")->with('success', Lang::get('admin/licenses/message.checkin.success'));
 		}
 
 		// Redirect to the asset management page with error
-		return Redirect::to("admin/licenses")->with('error', Lang::get('admin/licenses/message.checkout.error'));
+		return Redirect::to("admin/licenses")->with('error', Lang::get('admin/licenses/message.checkin.error'));
 	}
 
 	/**

app/lang/en/admin/licenses/message.php

@@ -25,6 +25,11 @@
 	'checkout' => array(
 		'error'   => 'There was an issue checking out the license. Please try again.',
 		'success' => 'The license was checked out successfully'
-	)
+	),
+
+	'checkin' => array(
+		'error'   => 'There was an issue checking in the license. Please try again.',
+		'success' => 'The license was checked in successfully'
+	),
 
 );