Upgrade to v15.0.OS

2016-02-08 04:25:58 +05:30
parent b99b6f6f77
commit 078396d5d7
91 changed files with 3332 additions and 1720 deletions
--- a/ext/modules/time_sheets/api/Time_sheetsActionManager.php
+++ b/ext/modules/time_sheets/api/Time_sheetsActionManager.php
@@ -64,6 +64,13 @@ class Time_sheetsActionManager extends SubActionManager{
 		
 		$oldStatus = $timeSheet->status;
 		$timeSheet->status = $req->status;
+
+
+        //Auto approve admin timesheets
+        if($req->status == 'Submitted' && BaseService::getInstance()->getCurrentUser()->user_level == "Admin"){
+            $timeSheet->status = 'Approved';
+        }
+
 		
 		if($oldStatus == $req->status){
 			return new IceResponse(IceResponse::SUCCESS,"");