From 4ed902b7bf8d0930b8b9054b5daf261c6c548326 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 9 Sep 2017 15:32:51 +0530
Subject: [PATCH] poapproval

---
 application/models/purchaseorder_model.php |  2 +-
 application/views/poapproval_view.php      | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index ad9fe6e7..c7125202 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -1233,7 +1233,7 @@ function GetCurrencytype()
     {
 		
 		  $this->db->distinct();
-		  $this->db->select('mast.PONO,mast.TotalOrderValue,st.StatusCode,st.StatusName,emp.FirstName,mast.CreatedDate,ccm.CostCenterName,ccm.CostCenterCode,mast.POType as ReqType,mast.Remarks,DepartmentName,mast.ApprovedBy,(select EmpID from tbl_users where userId=mast.ApprovedBy )as EID,
+		  $this->db->select('mast.PONO,mast.TotalOrderValue,st.StatusCode,st.StatusName,emp.FirstName,mast.CreatedDate,ccm.CostCenterName,ccm.CostCenterCode,mast.POType as RType,mast.Remarks,DepartmentName,mast.ApprovedBy,(select EmpID from tbl_users where userId=mast.ApprovedBy )as EID,rmast.ReqType,mast.Status,
 (select FirstName from T_Employee_Details where EmpID=EID)as Approver');
 		  $this->db->from('T_PurchaseOrder_Master mast');
 		 // $this->db->order_by('mast.Status',"PO_CREATED");
diff --git a/application/views/poapproval_view.php b/application/views/poapproval_view.php
index 0a1de42f..c5308f41 100755
--- a/application/views/poapproval_view.php
+++ b/application/views/poapproval_view.php
@@ -58,12 +58,24 @@ if(empty($Status))
 					    <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><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 ?>
+
+
+                        <?php if(($record->RType=='IMPORT')&&($record->StatusCode!='ST015'))
+                       {?>
+
+                        <a target="_blank"  href="<?php echo base_url() ?>purchaseorder/PurchaseOrderFinanceView?PONO=<?php echo $record->PONO ?>&ReqType=<?php echo $record->ReqType ?>&POType=<?php echo $record->RType ?>"  data-id="<%=index%>" data-userid="" ><u><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to View the Purchase Order details"></i> 
+
+                           <?php }?> 
+
+
+
+						 </td>	
 						
 						
 					
 						
-						<td><?php echo $record->ReqType ?> </td>
+						<td><?php echo $record->RType ?> </td>
 						<td><?php echo $record->CostCenterName ?> </td>