From d0e92725ba63cd7ece93ae140b808c6e9e378720 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 22 Nov 2017 18:29:59 +0530
Subject: [PATCH] redirect

---
 application/models/mrir_model.php        | 2 +-
 application/views/serviceporeport.php    | 8 ++++++--
 application/views/viewmrirforbilling.php | 9 ++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php
index c4339b8a..27658576 100755
--- a/application/models/mrir_model.php
+++ b/application/models/mrir_model.php
@@ -119,7 +119,7 @@ POL.status in (?,?)
           $this->db->distinct();
           $this->db->select('TMM.MRIRNO,TMM.PONO, TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo,
 IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.QualityInchargeID,
-TMD.PlantInchargeID,TMD.UpdateBY, POM.PODate,POM.POType,POM.ReleasedBy,ED2.FirstName as StoreinchargeName,POM.IsQualityChkReqired,POM.POType,POM.CapitalRange,
+TMD.PlantInchargeID,TMD.UpdateBY, POM.PODate,POM.POType,POM.ReleasedBy,ED2.FirstName as StoreinchargeName,POM.IsQualityChkReqired,POM.POType,POM.CapitalRange,POM.Status,
 ED.FirstName as UpdatedbyName,ED1.FirstName as ReleasedbyName,MM.MaterialCode,MM.MaterialName,
 MM.UOM, POL.Quantity,IGRD.QuantityAsPerInvoice, TMD.ActualQuantityReceived,TMD.QuantityAccepted,
 TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ');
diff --git a/application/views/serviceporeport.php b/application/views/serviceporeport.php
index 74c1b666..bb425c28 100755
--- a/application/views/serviceporeport.php
+++ b/application/views/serviceporeport.php
@@ -98,9 +98,13 @@ $Adv='';
 					    <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().'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> 
+             <?php if($PO=='SPECIAL PO'){?>
 
-						<!-- <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><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> <?}
+
+             else {?>
+
+						 <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> <?php }?>
 						<td><?php echo $record->SupplierName?></td>						
 						<td><?php echo $record->MaterialCode?></td>
 						<td><?php echo $record->MaterialName?></td>
diff --git a/application/views/viewmrirforbilling.php b/application/views/viewmrirforbilling.php
index dff1debe..24ba1acc 100755
--- a/application/views/viewmrirforbilling.php
+++ b/application/views/viewmrirforbilling.php
@@ -114,7 +114,14 @@ span.highlight1{
 						
 						<!--  <td><?php echo $d->PONO ?></td>  -->
 
-						<td><a target="_blank"  href="<?php echo base_url().'EditPO?PONO='.$d->PONO.'&ReqType='.$d->POType.'&CapitalRange='.$d->CapitalRange; ?>"  data-id="<%=index%>" style="color:<?php echo $color?>" data-userid="<?php echo $d->PONO ?>" ><?php echo $d->PONO ?> </a></td>
+						<?php if($d->Status == SPECIAL_PO) {?>
+
+						<td><a target="_blank"  href="<?php echo base_url().'EditPO?PONO='.$d->PONO.'&ReqType='.$d->POType.'&CapitalRange='.$d->CapitalRange; ?>"  data-id="<%=index%>" style="color:<?php echo $color?>" data-userid="<?php echo $d->PONO ?>" ><?php echo $d->PONO ?> </a></td><?}
+
+					  else{?>
+
+					<td><a target="_blank"  href="<?php echo base_url() ?>purchaseorder/CreatePOPrint?PONO=<?php echo $d->PONO ?>&ReqType=<?php echo $d->POType ?>"  data-id="<%=index%>" style="color:<?php echo $color?>" data-userid="<?php echo $d->PONO ?>" ><?php echo $d->PONO ?> </a></td><?php }?>
+
 						<td><?php echo $d->POType ?></td><!-- Department  -->
 						<td><?php echo $d->MaterialCode ?></td><!-- Material Code  -->
 						<td><?php echo $d->MaterialName ?></td><!-- Material Name  -->