SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redirect

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-11-22 18:29:59 +05:30
parent 89502b4ad9
commit d0e92725ba
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/mrir_model.php
View File

@ -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 ');

8
application/views/serviceporeport.php
View File

@ -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>

9
application/views/viewmrirforbilling.php
View File

@ -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 -->