From 89502b4ad90afb1878b9ec022326171925c1e907 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 22 Nov 2017 17:42:44 +0530
Subject: [PATCH] redirect

---
 application/models/purchaseorder_model.php |  2 +-
 application/views/serviceporeport.php      | 24 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index ab6e2dd3..cb0cb48a 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -77,7 +77,7 @@ class purchaseorder_model extends CI_Model
 	
 	function GetServicePOListforBilling()
 	{
-		$subQuery ='select POMast.PONO,supp.SupplierName,PODate,POMast.PaymentTerms,POMast.ServiceWorkStatusRemarks,
+		$subQuery ='select POMast.PONO,supp.SupplierName,PODate,POMast.PaymentTerms,POMast.ServiceWorkStatusRemarks,StatusName,POMast.CapitalRange,POType,
 					LineItem.*,mat.MaterialName,mat.UOM,emp.FirstName,emp.LastName,Tax.TotalValue,Cost.CostCenterName,AdvanceAmount
 					,Dept.DepartmentName from  T_PurchaseOrder_Master POMast
 					join  T_PurchaseOrder_LineItem LineItem on LineItem.PONO = POMast.PONO 
diff --git a/application/views/serviceporeport.php b/application/views/serviceporeport.php
index 7ea85830..74c1b666 100755
--- a/application/views/serviceporeport.php
+++ b/application/views/serviceporeport.php
@@ -13,7 +13,9 @@ $Adv='';
    span.highlight {
     background-color: yellow;
 }
-   
+   span.highlight1{
+  background-color: red;
+  }
 </style>  
 
 
@@ -29,6 +31,10 @@ $Adv='';
               <center><h3 class="box-title"> Service Purchase Order Report</h3></center>
 <span class="highlight">The PONO Shown In Green Colour Are Paid Advance Amount</span>
 
+<br>
+<br>
+ <span class="highlight1">The PONO Shown In Red Colour Are Special PO</span>         
+
             </div>
 			<div class="box-body">
               <table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
@@ -72,15 +78,27 @@ $Adv='';
                                         	{
                                                $color="baby blue";
                                         	}
+
+                                       $PO=$record->StatusName;
+                                       //echo $PO;
+                                       if($PO=='SPECIAL PO')
+                                       {
+                                           $color1="Brown";
+                                       } 
+
+                                       else
+                                       {
+                                          $color1="baby blue";
+                                         }  
                                     	//print_r($MRIRDetails);
                                        
 							              
                             ?> 
-							  <tr>
+							  <tr style="color:<?php echo $color1?>">
 					    <td><?php echo $SNo?></td> 
 						 <!-- <td><a  data-toggle="tooltip" href="<?php echo base_url().'purchaseorder/CreateMRIRPOPrint?PONO='.$record->PONO.'&POType='.SERVICE ?>" style="color:<?php echo $color?>" target="new"><?php echo $record->PONO?></a></td> -->
 
-             <td><a target="_blank"  href="<?php echo base_url() ?>purchaseorder/CreatePOPrint?PONO=<?php echo $record->PONO ?>&ReqType=<?php echo SERVICE ?>"  data-id="<%=index%>" style="color:<?php echo $color?>" data-userid="<?php echo $record->PONO ?>" ><?php echo $record->PONO ?> </a></td> 
+             <td><a target="_blank"  href="<?php echo base_url().'EditPO?PONO='.$record->PONO.'&ReqType='.$record->POType.'&CapitalRange='.$record->CapitalRange; ?>"  data-id="<%=index%>" style="color:<?php echo $color?>" style="color:<?php echo $color?>" data-userid="<?php echo $record->PONO ?>" ><?php echo $record->PONO ?> </a></td> 
 
 						<!-- <td><a target="_blank"  href="<?php echo base_url() ?>purchaseorder/CreateMRIRPOPrint?PONO=<?php echo $record->PONO ?>&POType=<?php echo $record->POType ?>"  data-id="<%=index%>" data-userid="<?php echo $record->PONO ?>" ><?php echo $d->PONO ?> </a></td> -->
 						<td><?php echo $record->SupplierName?></td>