diff --git a/application/controllers/emppaydate.php b/application/controllers/emppaydate.php
index 68ae49e2..a3487a97 100755
--- a/application/controllers/emppaydate.php
+++ b/application/controllers/emppaydate.php
@@ -65,10 +65,10 @@ class emppaydate extends BaseController
      */
     function addemppaydate()
     {
-        
+        $q="addemppaydate";   
               $this->load->model('payroll_model');
             
-            $result['empdetails'] = $this->payroll_model->getEmpID();
+            $result['empdetails'] = $this->payroll_model->getEmpID($q);
 
             //$data['emp_id'] = $this->monthlypay_model->getmonthlypay(); 	
             
diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php
index 4a376800..42c3848a 100755
--- a/application/controllers/payslip.php
+++ b/application/controllers/payslip.php
@@ -430,7 +430,13 @@ function getEmployee()
                         //echo $highestRow;
                         $FileDetails = array('PayOn'=>$PayOn,'TotalNoofDays'=>$Totaldays,'FileName'=> $config['file_name'],'CreatedBy'=>$createdby);
 						$result = $this->payroll_model->UploadFileName($FileDetails);
-                       
+                       $emplid=$this->payroll_model->getEmpID($q='');
+					    
+						
+                        $Unknowncount=0;
+						$Unknown="";
+						$row="";
+						$d=array("-1"=>"");
                         $fail=0;
                         $success=0;
                         for($x=8;$x<=$highestRow;$x++){
@@ -438,7 +444,22 @@ function getEmployee()
                             $EmpId  =   $sheet->getCell('A'.$x)->getValue(); 
                             //echo $EmpId;
 							
-							
+							$flag=0;
+						     foreach($emplid as $e){
+	
+						    if(strtoupper($EmpId) == $e->EmpID){
+	
+						    $flag++;
+						   // echo "<br>".$myvar.":- is valid empid";
+							}
+							 }
+							if($flag==0){
+								//echo "<br>".$myvar.":- not a valid empid";
+								$Unknowncount++;
+								$Unknown.='-'.$EmpId;
+								$row.='-'.$x;
+								//$d.=$EmpId;
+								}
                             
                             $FileDataExists = $this->payroll_model->checkFileDetailsExists2($PayOn,$EmpId);
                             //echo $FileExists;
@@ -463,7 +484,8 @@ function getEmployee()
                         //{
                             
                              
-                             $EmpId  =   $sheet->getCell('A'.$x)->getValue();     
+                             $EmpId  =   $sheet->getCell('A'.$x)->getValue();    
+							 $EmpId=strtoupper($EmpId);							 
                              $LOPDays = $sheet->getCell('B'.$x)->getValue();
                              $OTHoursWorked  =$sheet->getCell('C'.$x)->getValue(); 
                              $loanRecovered=$sheet->getCell('D'.$x)->getValue(); 
@@ -473,13 +495,19 @@ function getEmployee()
                             
                              if( $EmpId != '')
                              {
+								 
+								 
+								 foreach($emplid as $e){
+	
+						    if($EmpId == $e->EmpID){
+	
                              
                                  $FileData = array('Month_Year'=>$PayOn,'EmpID'=>$EmpId,'LOP_Days'=>$LOPDays,'OT_Hrs_Worked'=>$OTHoursWorked,'Loan_Recovered'=>$loanRecovered,'Loan_Balance'=>$loanBalance,'Incentives'=>$Incentive,'Other_Deductions'=>$Other_Deductions,'Created_By'=>$createdby,'Created_Time'=>date("Y-m-d h:i:sa"));                                
                                  $result = $this->payroll_model->UploadFileData2($FileData);               
                                  $success++;
                              }                                                  
                         
-                    
+								 }
                         
                         // $data['Success'] =  "<script>alert('File Uploaded Successfully!');</script>";
                         
@@ -510,7 +538,7 @@ function getEmployee()
             
                         //$data['success']  =  "<script>alert($fail + 'Duplicate Data Found!');</script>";
                         echo "<script> alert($success +'  Data Uploaded sucessfully and  ' + $fail + '  Duplicate Data Found'); </script>";
-                        
+                        echo "<script>alert($Unknowncount+'-data invalid, and data are'+'$Unknown'+'found at rows'+'$row');</script>";
                         $this->global['pageTitle'] = 'Siddharth : Payroll Data Upload';
         
                         $this->loadViews("payslipupload2", $this->global , NULL);
diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index c3bd4d08..f8ae07d0 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -783,7 +783,7 @@ class purchaseorder extends BaseController
 			// Load the pdf page with multiviews
 			$data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
 			$data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetailsForPrint($PONO);
-			
+			$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
             $this->load->View("servicepopdf", $data);
 			
 			// Add header to pdf
@@ -1165,6 +1165,102 @@ public function importpoprint($PONO)
 					
 					echo 'Purchase Order Updated Successfully! PO Number Is: '.$PONO ;
     }
+	
+	
+	/*  All Function following This command for FINANCE TEAM PO APPROVAL SCREEN*/
+	 function poapproval(){
+	 $q="A";
+	 $this->global['pageTitle'] = 'Siddharth : Purchase Order Approval';
+	// $data['Status']= $this->purchaseorder_model->getStatus();
+	 $userID =  $this->session->userdata ( 'userId' );
+	 //print_r($data['Status']);echo "CON";
+	 $data['AppList'] = $this->purchaseorder_model->getPOList($q);  	  
+	 $this->loadViews("poapproval_view", $this->global,$data, NULL);
+	 
+	 }
+	 
+	  function getDateformat2($Val)
+	{
+		       $date = new DateTime($Val);
+				$retDate = $date->format('Y-m-d H:i:s');
+				return $retDate;
+	}
+	
+	
+	function ApprovePO()
+	{
+		  $StatusCode= Trim($_POST['SCode']);
+		  
+		  $PONO= Trim($_POST['PONO']);
+		  $Remarks= Trim($_POST['NewRemarks']);
+		 
+		  $ApprovedBy = $this->session->userdata ( 'userId' );
+				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
+		  $ApprovedDate =  $dt->format('Y-m-d H:i:s');
+		  
+		  if($StatusCode == 'ST025')
+		  {
+		  
+		  $store = array('Status'=>$StatusCode,'ApprovedOn'=>$ApprovedDate,'Approvedby'=>$ApprovedBy,'Remarks'=>$Remarks);
+		  $this->purchaseorder_model->UpdatePO($store,$PONO); 
+		  echo "Successfully Updated the Purchase Order No: ".$PONO;
+		  }
+		  else{
+		  $store = array('Status'=>$StatusCode,'OnHoldOn'=>$ApprovedDate,'OnHoldBy'=>$ApprovedBy,'Remarks'=>$Remarks);
+		  $this->purchaseorder_model->UpdatePO($store,$PONO); 
+		  echo "Successfully Updated the Purchase Order No: ".$PONO;
+		  
+	}
+		  
+	
+	
+		 
+  }	
+  
+  
+	
+	
+	/* FOLLOWING CODES FOR PO RELEASE SCREEN FUNCTIONALITIES*/
+	 
+	 
+	 function porelease(){
+	 
+	 $q="R";
+	 $this->global['pageTitle'] = 'Siddharth : Purchase Order Release';
+	// $data['Status']= $this->purchaseorder_model->getStatus();
+	 $userID =  $this->session->userdata ( 'userId' );
+	 //print_r($data['Status']);echo "CON";
+	 $data['AppList'] = $this->purchaseorder_model->getPOList($q);  	  
+	 $this->loadViews("porelease_view", $this->global,$data, NULL);
+	 
+	 }
+	 
+	 
+	 function ReleasePO()
+	{
+		  $StatusCode= Trim($_POST['SCode']);
+		  
+		  $PONO= Trim($_POST['PONO']);
+		  $Remarks= Trim($_POST['NewRemarks']);
+		 
+		  $ReleasedBy = $this->session->userdata ( 'userId' );
+				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
+		  $ReleasedDate =  $dt->format('Y-m-d H:i:s');
+		  
+		  if($StatusCode == 'ST026')
+		  {
+		  
+		  $store = array('Status'=>$StatusCode,'ReleasedOn'=>$ReleasedDate,'ReleasedBy'=>$ReleasedBy,'Remarks'=>$Remarks);
+		  $this->purchaseorder_model->UpdatePO($store,$PONO); 
+		  echo "Successfully Updated the Purchase Order No: ".$PONO;
+		  }
+		  else{
+		  $store = array('Status'=>$StatusCode,'OnHoldOn'=>$ReleasedOn,'OnHoldBy'=>$ReleasedBy,'Remarks'=>$Remarks);
+		  $this->purchaseorder_model->UpdatePO($store,$PONO); 
+		  echo "Successfully Updated the Purchase Order No: ".$PONO;
+		  
+		  }
+}
 
 }
 
diff --git a/application/models/payroll_model.php b/application/models/payroll_model.php
index 0ccb40b3..665a6a76 100755
--- a/application/models/payroll_model.php
+++ b/application/models/payroll_model.php
@@ -226,11 +226,13 @@ class Payroll_model extends CI_Model
 		       
     }
     
-    function getEmpID()
+    function getEmpID($q='')
    {
        $this->db->select('EmpID,FirstName,LastName');
        $this->db->from('T_Employee_Details');
+	    if($q == "addemppaydate"){
 	   $this->db->where('EmpID NOT IN (SELECT EmpID from T_Emp_Pay_Data)',NULL,FALSE);
+		}
        $query = $this->db->get();
        return $query->result();
    }
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index 1c4ba21c..e1247303 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -886,6 +886,66 @@ function GetCurrencytype()
         
         return TRUE;
     }
+	
+	/**
+     * This function is used to get the List of  PO details to the approver
+     * @return array $result : This is result of the query
+	 join T_DepartmentDetails Dept on  emp.Departmentcode = Dept.DEPCode 
+     */
+	function getPOList($q)
+    {
+		
+		  $this->db->distinct();
+		  $this->db->select('mast.PONO,mast.TotalOrderValue,st.StatusName,emp.FirstName,mast.CreatedDate,ccm.CostCenterName,rmast.ReqType,bud.BudgetAmount,mast.Remarks');
+		  $this->db->from('T_PurchaseOrder_Master mast');
+		  $this->db->join('T_Status st', 'st.StatusCode=mast.Status');
+		  $this->db->join('tbl_users tbl', 'mast.createdby=tbl.userid');
+		  $this->db->join('T_Employee_Details as emp', 'emp.empid=tbl.empid');
+		  $this->db->join('T_PurchaseOrder_LineItem req', 'req.PONO= mast.PONO');
+		  $this->db->join('T_Requestion_Master rmast','rmast.ReqNo=req.ReqNo');
+		  $this->db->join('T_CostCenter_Budget bud','bud.CostCenterCode = req.CostCenterCode and bud.BudgetType = rmast.ReqType');
+		  $this->db->join('T_CostCenter_Master ccm','ccm.CostCenterCode = req.CostCenterCode and ccm.CostCenterCode = bud.CostCenterCode');
+		  if($q=='A'){
+		  $this->db->where('mast.Status','ST015');//PO CREATED
+		  $this->db->or_where('mast.Status','ST020');//ON HOLD
+		  $this->db->or_where('mast.Status','ST025');// PO APPROVED
+		  $this->db->or_where('mast.Status','ST026');//PO RELEASED
+		  $this->db->or_where('mast.Status','ST024'); // EMERGENGY PO
+		  }
+		  else if($q=='R'){
+		  $this->db->or_where('mast.Status','ST025');// PO APPROVED
+		  }
+		  $result=$this->db->get();
+         // print_r($result->result());
+		  return $result->result();
+		
+		
+
+		
+		
+    }
+	
+	
+	function UpdatePO($store, $PONO)
+    {
+		
+        $this->db->where('PONO', $PONO);
+        $this->db->update('T_PurchaseOrder_Master', $store);
+        
+        return TRUE;
+    }
+	
+	function GetReleasedDetails($PONO){
+	$this->db->select('mast.ReleasedOn,re.FirstName');
+	$this->db->from('T_PurchaseOrder_Master mast');
+	$this->db->join('tbl_users tbl','mast.ReleasedBy=tbl.userid');
+	$this->db->join('T_Employee_Details re','re.EmpID=tbl.EmpID');
+	$this->db->where('mast.PONO',$PONO);
+	$result=$this->db->get();
+	
+	return $result->result();  
+	
+	}
 }
 
   
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index a5a03d54..055bc803 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -244,7 +244,7 @@
 										
 							?>			
            <?php
-					if( $role == ROLE_MANAGER|| $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN)
+					if( $role == ROLE_MANAGER|| $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN || $DEPCode == MANAGEMENT)
 				{
 				?>
 					<li class="treeview">
@@ -295,7 +295,7 @@
 					
 			<?php
 						//if(($DEPCode == FINANCE && $role == ROLE_MANAGER)|| ($(DEPCode == PURCHASE && $role == ROLE_EMPLOYEE)))
-						if($DEPCode == FINANCE || $DEPCode == PURCHASE )
+						if($DEPCode == FINANCE || $DEPCode == PURCHASE || $DEPCode == MANAGEMENT)
 						{
 						?>
 						 
@@ -361,6 +361,23 @@
 						 <?php
 						}
 						?>
+						
+						<!--FOR Relese PO Management Team -->
+						<?php
+						//if($DEPCode != FINANCE && $DEPCode == PURCHASE)
+							if( $DEPCode == MANAGEMENT)
+						{
+						?>
+                        <li class="treeview">
+                          <a href="<?php echo base_url(); ?>purchaseorder/porelease">
+                            <i class="fa fa-history"></i>
+                            <span>Release Purchase Order</span>
+                          </a>
+                        </li>
+						 <?php
+						}
+						?>
+						<!--END Relese PO Management Team -->
 				</ul> 
             </li>
 						<?php
diff --git a/application/views/payslipupload2.php b/application/views/payslipupload2.php
index b9f41409..084ddd0c 100755
--- a/application/views/payslipupload2.php
+++ b/application/views/payslipupload2.php
@@ -17,6 +17,9 @@
 		
 
 		</script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/js/bootstrap-datepicker.js"></script>
+ 
+ <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/css/bootstrap-datepicker.css" rel="stylesheet">
 
 <script>
 function checkYearMonthAsEmpty()
diff --git a/application/views/poapproval_view.php b/application/views/poapproval_view.php
new file mode 100644
index 00000000..1d536282
--- /dev/null
+++ b/application/views/poapproval_view.php
@@ -0,0 +1,370 @@
+
+<?php 
+//echo "OUTIF";
+if(empty($Status))
+{
+	//echo "INIF";
+ //print_r($Status); 
+}
+?>
+
+<style>
+            .table-bordered>thead>tr>th, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>tbody>tr>td, .table-bordered>tfoot>tr>td {border: 1px solid #333;}
+			.modal-content {
+				width:1000px  ! important;
+			}
+			
+			.modal
+{
+    padding-right:25% ! important;
+}
+            </style>
+<div class="content-wrapper">
+    
+ 
+	 <section class="content">
+	 
+	 
+	 
+	 
+	 <div>
+         <center><b><h2>Purchase Order Approval List </h2></b></center>
+	<table id="Requisition" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+  <div align="right" style="padding-right:10px">
+     <div id="content" > </div> 
+  <div class="modal fade"  role="dialog">
+		
+   <thead style="background-color:#ddf">
+      <tr>
+	     
+         <th>Purchase Order Number</th>
+		 <th>Purchase Order Type</th>
+		 <th>Cost Center Name</th>
+		 <th>Available Budget Amount</th>
+		 <th>Total Order Value</th>
+         <th>Created By</th>
+         <th>Created Date</th>
+		 <th>Status</th>         
+         <th>Action</th>
+		 <th>Remarks</th>
+      </tr>
+    </thead>
+    <tbody id="ApprovalList">
+     
+	    <?php
+                    if(!empty($AppList))
+                    {
+						$index = 0;
+                        foreach($AppList as $record)
+                        {
+							$index = $index +1;
+							//echo $index;
+                    ?> 
+					    <tr id="<?php echo $index ?>" >
+						
+						
+						<td><a target="_blank"  href="<?php echo base_url() ?>purchaseorder/CreatePOPrint?PONO=<?php echo $record->PONO ?>&ReqType=<?php echo $record->ReqType ?>"  data-id="<%=index%>" data-userid="<?php echo $record->PONO ?>" ><u><?php echo $record->PONO ?> </td>	
+						
+						
+					
+						
+						<td><?php echo $record->ReqType ?> </td>
+						<td><?php echo $record->CostCenterName ?> </td>
+						<td align="right"><?php echo $record->BudgetAmount ?> </td>
+						
+						<td align="right"><?php echo $record->TotalOrderValue ?></td>
+						<td><?php echo $record->FirstName ?></td>
+						<td align="right"><?php $Cdt =	new DateTime($record->CreatedDate);
+						$CreatedDate =  $Cdt->format('d-m-Y');
+						echo  $CreatedDate;
+						?></td>
+						<td><?php echo $record->StatusName ?></td>
+						<?php 
+						if($record->StatusName == 'PO APPROVED' or $record->StatusName == 'PO RELEASED')
+						{
+						
+						?>
+						
+						
+						<td>
+					
+					<select disabled name="selectId" id="selectId" title="You Can't Select Here">        				        
+    					        <option value="-1" >Select Option</option>
+        				        <option value="1">Approve</option>
+        				        <option value="2">OnHold</option>
+						    </select>
+							</td>  
+							
+						<?php 
+						}elseif($record->StatusName == 'ON HOLD' or $record->StatusName == 'PO CREATED' or $record->StatusName == 'EMERGENCY PO'){
+						?>
+						<td>
+					
+					<select name="selectId" id="selectId" title="Select Your Option" onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index ; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');">        				        
+    					        <option value="-1" >Select Option</option>
+        				        <option value="1">Approve</option>
+        				        <option value="2">OnHold</option>
+						    </select>
+							</td> 
+						
+						<?php }?>
+						     <td contenteditable="true" id="remarks<?php echo $index ; ?>"> <?php echo $record->Remarks ?> </td>
+						
+							</tr>
+							
+							
+							
+						<?php
+                        }
+                    }
+                    ?>
+    
+     
+    </tbody>
+	
+  </table>
+ <script>
+	function showvalue(PONO,value,Status,Remarks)
+	{
+		//alert(value);
+		var curtremarks=document.getElementById('remarks'+value+'').innerHTML;
+		//alert(curtremarks);
+		//var curtremarks="CUR"
+		var PO=PONO;
+		//var val=value;
+		var Status=Status;
+		
+		var Remarks=Remarks+'||'+curtremarks;
+		//alert(Remarks);
+		var StatusCode='';
+		var srtMsg='';
+		//alert(PO+"-"+Status+"-"+StatusCode+"-"+Remarks);
+		if(Status != '-1'){
+		if(Status == '1'){
+		var strMsg='Do you want to Approve this Purchase Order?'
+		var StatusCode='ST025';
+         //alert(StatusCode);
+		}
+		else if(Status == '2')
+		{
+	    var strMsg='Do you want to put Hold this Purchase Order?';
+		var StatusCode='ST020';
+		//alert(StatusCode);
+		}
+		
+		/* MSG*/
+		var answer = confirm(strMsg);
+		if (answer) 
+		{ 	
+			$('#content').loader('show');
+		    $.ajax({ 
+			data:{PONO:PO,SCode:StatusCode,NewRemarks:Remarks},
+			type:"POST",
+			url:"<?php echo base_url() ?>purchaseorder/ApprovePO",
+			success:function(data) {
+			if(data)
+			{
+				$('#content').loader('hide'); 
+				 alert(data);
+				 location.reload();		 
+			}
+			else
+			{
+				alert("Error");	
+			}			
+		
+		}
+
+  
+}); 
+
+}
+else
+{
+return;
+}
+		
+	
+		/* MSG*/
+		
+	}
+	else
+{
+alert('please Select Status!');
+}
+
+	
+	} //End of showvalue function for approve/hold po status
+</script> 
+         
+ 
+         <br>
+	 </div>
+         </div>
+         
+        </section>
+</div>
+
+<script> 
+	var startDate = '';
+	 var endDate = '';
+ 
+function Reset()
+{
+	 $('#RequisitionStatus').val("-1");
+	 $('#SearchDate').val('');
+}
+<!-- JQuery For POP UP and Getting all relevant Data -->
+$("#myModal").on("shown.bs.modal", function(e) {
+    var  ReqId = $(e.relatedTarget).data('userid');
+	$("#RequistionNo").val('');
+	$("#drpSupplier").val('');
+	$("#POType").val('');
+	$("#Tax Range").val(''); //not conform
+	$("#SupAddress").val('');
+	$("#DeliveryAddr").val('');
+    $("#PODate").val('');
+	$("#Deliverydt").val('');
+	$("#tbleAppend").empty();
+	 $("#txtTotBasicAmount").val('');
+	 $("#txtTotalDiscount").val('');
+	 $("#txtTotalVat").val('');
+	 $("#txtTotCST").val('');
+	 $("#txtTotalPackaing").val('');
+	 $("#txtTotExciseDuty").val('');
+	 $("#txtTotalGST").val('');
+	 $("#txtTotalInsurance").val('');
+	 $("#txtTotalFreight").val('');
+	  $("#txtTotalOtherTaxes").val('');
+	   $("#txtTotalOrderValueSummary").val('');
+	    $("#txtSpcialInstruction").val('');
+	 $('#AlertImg').attr("style","display:none;");
+	
+	$('#content').loader('show');
+		    $.ajax({ 
+			data:{id:ReqId},
+			type:"POST",
+			dataType: 'json',
+			url:"<?php echo base_url() ?>requisitionform/ViewRequest",
+			success:function(json) {
+			//	success:function(data) {
+				$('#content').loader('hide');
+				//alert(data);
+				$("#ReqType").val(json.Requist[0]['ReqType']);	
+				$("#ReqBy").val(json.Requist[0]['Requestedby']);
+				 $("#ReqDate").val(json.Requist[0]['CreatedDate']);
+		        $("#Desigination").val(json.Requist[0]['Designation']);
+				$("#CostCenter").val(json.Requist[0]['CostCenterCode']);
+				 $("#AvlBudgetAmount").val(json.AvilBudAmount);
+					
+				$("#tbleAppend").append(json.Items);		
+		
+		}
+  
+}); 
+	
+});
+
+<!-- End of JQuery For POP UP and Getting all relevant Data -->
+
+function printpdf(PONO,value,Status) {
+	
+	
+	var PONO =PONO;
+	var Status = Status;
+	var value = value;
+	alert(PONO+Status+value);
+	
+	 if(PONO != '' && Status != '' && value != ''){
+         	alert('inside if '+PONO+Status+value);
+			
+			$.ajax({ 
+			data:{PONO1:PONO,Status1:Status},
+			type:"POST",
+			url:"<?php echo base_url() ?>purchaseorder/Poprintpdf",
+			/*success:function(data) {
+			if(data)
+			{
+				alert(data);
+			}
+			else
+			{
+				alert("Error");	
+			}			
+		
+		}*/
+
+  
+});
+			 
+	 }
+	 else{
+		 alert('inside else '+PONO+Status+value);
+	 }
+}
+
+	
+$(function() {	
+	var d = new Date();
+
+	var month = d.getMonth();
+	var day = d.getDate();
+	var year = d.getFullYear()  ;
+	var SIAStartYear = year - 2015;
+	var mindt = year-70;
+	var maxdt =  year-15;
+    $( ".datePicker" ).datepicker(
+	{ 
+	 	minDate : new Date(year-SIAStartYear,1,1),
+		maxDate :'now',
+		dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,	  
+	}
+	);
+    //$('#SearchDate').daterangepicker(  	);
+    //Initialize Select2 Elements
+    $(".select2").select2();
+	//$('#SearchDate').val('');
+	$('#SearchDate').daterangepicker(
+{
+    locale: {
+      format: 'DD-MM-YYYY'
+    },
+   
+	 showDropdowns: true
+}, 
+function(start, end, label) {
+	
+	 startDate = start.format('DD-MM-YYYY');
+	  endDate = end.format('DD-MM-YYYY');
+	    $('#FromDate').val(startDate);
+	   $('#ToDate').val(endDate);
+	 
+	
+    //alert("A new date range was chosen: " + start.format('DD-MM-YYYY') + ' to ' + end.format('DD-MM-YYYY'));
+});
+
+
+	
+});
+$(function () {
+   
+   $('#Items').DataTable({
+      "paging": false,
+      "lengthChange": true,
+      "searching": false,
+      "ordering": false,
+      "info": false,
+      "autoWidth": false
+	   
+    }); 
+    $('#Requisition').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	</script>
diff --git a/application/views/porelease_view.php b/application/views/porelease_view.php
new file mode 100644
index 00000000..070c571a
--- /dev/null
+++ b/application/views/porelease_view.php
@@ -0,0 +1,348 @@
+
+<?php 
+//echo "OUTIF";
+if(empty($Status))
+{
+	//echo "INIF";
+ //print_r($Status); 
+}
+?>
+
+<style>
+            .table-bordered>thead>tr>th, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>tbody>tr>td, .table-bordered>tfoot>tr>td {border: 1px solid #333;}
+			.modal-content {
+				width:1000px  ! important;
+			}
+			
+			.modal
+{
+    padding-right:25% ! important;
+}
+            </style>
+<div class="content-wrapper">
+    
+ 
+	 <section class="content">
+	 
+	 
+	 
+	 <div>
+         <center><b><h2>Purchase Order Release List </h2></b></center>
+	<table id="Requisition" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+  <div align="right" style="padding-right:10px">
+     <div id="content" > </div> 
+  <div class="modal fade"  role="dialog">
+		
+   <thead style="background-color:#ddf">
+      <tr>
+	     
+         <th>Purchase Order Number</th>
+		 <th>Purchase Order Type</th>
+		 <th>Cost Center Name</th>
+		 <th>Available Budget Amount</th>
+		 <th>Total Order Value</th>
+         <th>Created By</th>
+         <th>Created Date</th>
+		 <th>Status</th>         
+         <th>Action</th>
+		 <th>Remarks</th>
+      </tr>
+    </thead>
+    <tbody id="ApprovalList">
+     
+	    <?php
+                    if(!empty($AppList))
+                    {
+						$index = 0;
+                        foreach($AppList as $record)
+                        {
+							$index = $index +1;
+							//echo $index;
+                    ?> 
+					    <tr id="<?php echo $index ?>" >
+						
+						
+						<td><a target="_blank"  href="<?php echo base_url() ?>purchaseorder/CreatePOPrint?PONO=<?php echo $record->PONO ?>&ReqType=<?php echo $record->ReqType ?>"  data-id="<%=index%>" data-userid="<?php echo $record->PONO ?>" ><u><?php echo $record->PONO ?> </td>	
+						
+						
+						
+						
+						
+						<td><?php echo $record->ReqType ?> </td>
+						<td><?php echo $record->CostCenterName ?> </td>
+						<td align="right"><?php echo $record->BudgetAmount ?> </td>
+						
+						<td align="right"><?php echo $record->TotalOrderValue ?></td>
+						<td><?php echo $record->FirstName ?></td>
+						<td align="right"><?php $Cdt =	new DateTime($record->CreatedDate);
+						$CreatedDate =  $Cdt->format('d-m-Y');
+						echo  $CreatedDate;
+						?></td>
+						<td><?php echo $record->StatusName ?></td> 
+							
+						<?php 
+						if($record->StatusName == 'PO APPROVED'){
+						?>
+						<td>
+					
+					<select name="selectId" id="selectId" onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index ; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');">        				        
+    					        <option value="-1" >Select Action</option>
+        				        <option value="1">Release</option>
+        				        <option value="2">OnHold</option>
+						    </select>
+							</td> 
+						
+						<?php }?>
+						<td contenteditable="true" id="remarks<?php echo $index ; ?>"><?php echo $record->Remarks ?></td>
+							</tr>
+							
+							
+							
+						<?php
+                        }
+                    }
+                    ?>
+    
+     
+    </tbody>
+	
+  </table>
+ <script>
+	function showvalue(PONO,value,Status,Remarks)
+	{
+		var curtremarks=document.getElementById('remarks'+value+'').innerHTML;
+		var PO=PONO;
+		var Status=Status;
+		var StatusCode='';
+		var srtMsg='';
+		var Remarks=Remarks+'||'+curtremarks;
+		//alert(PO+"-"+Status+"-"+StatusCode);
+		if(Status != '-1'){
+		if(Status == '1'){
+		var strMsg='Do you want to Release this Purchase Order?'
+		var StatusCode='ST026';
+         //alert(StatusCode);
+		}
+		else if(Status == '2')
+		{
+	    var strMsg='Do you want to put Hold this Purchase Order?';
+		var StatusCode='ST020';
+		//alert(StatusCode);
+		}
+		
+		/* MSG*/
+		var answer = confirm(strMsg);
+		if (answer) 
+		{ 	
+			$('#content').loader('show');
+		    $.ajax({ 
+			data:{PONO:PO,SCode:StatusCode,NewRemarks:Remarks},
+			type:"POST",
+			url:"<?php echo base_url() ?>purchaseorder/ReleasePO",
+			success:function(data) {
+			if(data)
+			{
+				$('#content').loader('hide'); 
+				 alert(data);
+				 location.reload();		 
+			}
+			else
+			{
+				alert("Error");	
+			}			
+		
+		}
+
+  
+}); 
+
+}
+else
+{
+return;
+}
+		
+		
+		/* MSG*/
+		
+	}
+	else
+{
+alert('please Select Status!');
+}
+
+	
+	} //End of showvalue function for approve/hold po status
+</script> 
+         
+ 
+         <br>
+	 </div>
+         </div>
+         
+        </section>
+</div>
+
+<script> 
+	var startDate = '';
+	 var endDate = '';
+ 
+function Reset()
+{
+	 $('#RequisitionStatus').val("-1");
+	 $('#SearchDate').val('');
+}
+<!-- JQuery For POP UP and Getting all relevant Data -->
+$("#myModal").on("shown.bs.modal", function(e) {
+    var  ReqId = $(e.relatedTarget).data('userid');
+	$("#RequistionNo").val('');
+	$("#drpSupplier").val('');
+	$("#POType").val('');
+	$("#Tax Range").val(''); //not conform
+	$("#SupAddress").val('');
+	$("#DeliveryAddr").val('');
+    $("#PODate").val('');
+	$("#Deliverydt").val('');
+	$("#tbleAppend").empty();
+	 $("#txtTotBasicAmount").val('');
+	 $("#txtTotalDiscount").val('');
+	 $("#txtTotalVat").val('');
+	 $("#txtTotCST").val('');
+	 $("#txtTotalPackaing").val('');
+	 $("#txtTotExciseDuty").val('');
+	 $("#txtTotalGST").val('');
+	 $("#txtTotalInsurance").val('');
+	 $("#txtTotalFreight").val('');
+	  $("#txtTotalOtherTaxes").val('');
+	   $("#txtTotalOrderValueSummary").val('');
+	    $("#txtSpcialInstruction").val('');
+	 $('#AlertImg').attr("style","display:none;");
+	
+	$('#content').loader('show');
+		    $.ajax({ 
+			data:{id:ReqId},
+			type:"POST",
+			dataType: 'json',
+			url:"<?php echo base_url() ?>requisitionform/ViewRequest",
+			success:function(json) {
+			//	success:function(data) {
+				$('#content').loader('hide');
+				//alert(data);
+				$("#ReqType").val(json.Requist[0]['ReqType']);	
+				$("#ReqBy").val(json.Requist[0]['Requestedby']);
+				 $("#ReqDate").val(json.Requist[0]['CreatedDate']);
+		        $("#Desigination").val(json.Requist[0]['Designation']);
+				$("#CostCenter").val(json.Requist[0]['CostCenterCode']);
+				 $("#AvlBudgetAmount").val(json.AvilBudAmount);
+					
+				$("#tbleAppend").append(json.Items);		
+		
+		}
+  
+}); 
+	
+});
+
+<!-- End of JQuery For POP UP and Getting all relevant Data -->
+
+function printpdf(PONO,value,Status) {
+	
+	
+	var PONO =PONO;
+	var Status = Status;
+	var value = value;
+	alert(PONO+Status+value);
+	
+	 if(PONO != '' && Status != '' && value != ''){
+         	alert('inside if '+PONO+Status+value);
+			
+			$.ajax({ 
+			data:{PONO1:PONO,Status1:Status},
+			type:"POST",
+			url:"<?php echo base_url() ?>purchaseorder/Poprintpdf",
+			/*success:function(data) {
+			if(data)
+			{
+				alert(data);
+			}
+			else
+			{
+				alert("Error");	
+			}			
+		
+		}*/
+
+  
+});
+			 
+	 }
+	 else{
+		 alert('inside else '+PONO+Status+value);
+	 }
+}
+
+	
+$(function() {	
+	var d = new Date();
+
+	var month = d.getMonth();
+	var day = d.getDate();
+	var year = d.getFullYear()  ;
+	var SIAStartYear = year - 2015;
+	var mindt = year-70;
+	var maxdt =  year-15;
+    $( ".datePicker" ).datepicker(
+	{ 
+	 	minDate : new Date(year-SIAStartYear,1,1),
+		maxDate :'now',
+		dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,	  
+	}
+	);
+    //$('#SearchDate').daterangepicker(  	);
+    //Initialize Select2 Elements
+    $(".select2").select2();
+	//$('#SearchDate').val('');
+	$('#SearchDate').daterangepicker(
+{
+    locale: {
+      format: 'DD-MM-YYYY'
+    },
+   
+	 showDropdowns: true
+}, 
+function(start, end, label) {
+	
+	 startDate = start.format('DD-MM-YYYY');
+	  endDate = end.format('DD-MM-YYYY');
+	    $('#FromDate').val(startDate);
+	   $('#ToDate').val(endDate);
+	 
+	
+    //alert("A new date range was chosen: " + start.format('DD-MM-YYYY') + ' to ' + end.format('DD-MM-YYYY'));
+});
+
+
+	
+});
+$(function () {
+   
+   $('#Items').DataTable({
+      "paging": false,
+      "lengthChange": true,
+      "searching": false,
+      "ordering": false,
+      "info": false,
+      "autoWidth": false
+	   
+    }); 
+    $('#Requisition').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	</script>
diff --git a/application/views/revenuepopdf.php b/application/views/revenuepopdf.php
index 976443fb..f630120d 100755
--- a/application/views/revenuepopdf.php
+++ b/application/views/revenuepopdf.php
@@ -186,4 +186,23 @@ echo number_format($TotalAmount,2) ; ?></td>
 <br>
 <p>
 <div align="Left"> <b>Service Description:</b><br/><br/><?php echo $ServiceDescription;?></div></p>
+<?php 
+if(!empty($releasedetails)){
+	foreach($releasedetails as $detail){
+
+?>
+<table width="200%">
+<tr>
+<td><b>ReleasedBy:</b></td>
+<td><b>ReleasedOn:</b></td>
+</tr>
+<tr>
+<td><?php echo $detail->FirstName;?></td>
+<td><?php echo $detail->ReleasedOn;?></td>
+</tr>
+</table>
+<?php 
+	}
+}
+?>
 </div>
\ No newline at end of file
diff --git a/application/views/servicepopdf.php b/application/views/servicepopdf.php
index e422d421..2a524789 100755
--- a/application/views/servicepopdf.php
+++ b/application/views/servicepopdf.php
@@ -166,6 +166,24 @@ Currently editing:
 <br>
 <p>
 <div align="Left"> <b>Service Description:</b><br/><br/><?php echo $ServiceDescription;?></div></p>
+<?php 
+if(!empty($releasedetails)){
+	foreach($releasedetails as $detail){
 
+?>
+<table width="200%">
+<tr>
+<td><b>ReleasedBy:</b></td>
+<td><b>ReleasedOn:</b></td>
+</tr>
+<tr>
+<td><?php echo $detail->FirstName;?></td>
+<td><?php echo $detail->ReleasedOn;?></td>
+</tr>
+</table>
+<?php 
+	}
+}
+?>
 
 </div>