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

redirection on billing screen

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-11-22 17:27:07 +05:30
parent 6953d5526d
commit cb45b8f95a
2 changed files with 34 additions and 5 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->distinct();
$this->db->select('TMM.MRIRNO,TMM.PONO, TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo, $this->db->select('TMM.MRIRNO,TMM.PONO, TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo,
IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.QualityInchargeID, IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.QualityInchargeID,
TMD.PlantInchargeID,TMD.UpdateBY, POM.PODate,POM.POType,POM.ReleasedBy,ED2.FirstName as StoreinchargeName, TMD.PlantInchargeID,TMD.UpdateBY, POM.PODate,POM.POType,POM.ReleasedBy,ED2.FirstName as StoreinchargeName,POM.IsQualityChkReqired,POM.POType,POM.CapitalRange,
ED.FirstName as UpdatedbyName,ED1.FirstName as ReleasedbyName,MM.MaterialCode,MM.MaterialName, ED.FirstName as UpdatedbyName,ED1.FirstName as ReleasedbyName,MM.MaterialCode,MM.MaterialName,
MM.UOM, POL.Quantity,IGRD.QuantityAsPerInvoice, TMD.ActualQuantityReceived,TMD.QuantityAccepted, MM.UOM, POL.Quantity,IGRD.QuantityAsPerInvoice, TMD.ActualQuantityReceived,TMD.QuantityAccepted,
TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount '); TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ');

37
application/views/viewmrirforbilling.php
View File

@ -18,7 +18,12 @@ $color='';
span.highlight { span.highlight {
background-color: yellow; background-color: yellow;
} }
span.highlight1{
background-color: red;
}
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
@ -28,7 +33,12 @@ $color='';
<center><h3 class="box-title">Siddharth Industries - Billing For MRIR </h3></center> <center><h3 class="box-title">Siddharth Industries - Billing For MRIR </h3></center>
</div> </div>
<span class="highlight">The PONO Shown In Green Colour Are Paid Advance Amount</span>
<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 class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
@ -74,18 +84,37 @@ $color='';
{ {
$color="baby blue"; $color="baby blue";
} }
$PO=$d->IsQualityChkReqired;
$POT=$d->POType;
if($PO=='0' && $POT== 'REVENUE')
{
$color1="Brown";
}
else
{
$color1="baby blue";
}
?> ?>
<tr id="<?php echo $Index ?>"> <tr id="<?php echo $Index ?>" style="color:<?php echo $color1?>">
<td><?php echo $d->IGRNO ?></td> <td><?php echo $d->IGRNO ?></td>
<td><a data-toggle="modal" data-target="#materialreport" data-userid="<?php echo $d->MRIRNO ?>" data-id="<%=Index%>" data-dismiss="modal" ><?php echo $d->MRIRNO ?> </a></td> <td><a data-toggle="modal" data-target="#materialreport" data-userid="<?php echo $d->MRIRNO ?>" data-id="<%=Index%>" data-dismiss="modal" style="color:<?php echo $color1?>"><?php echo $d->MRIRNO ?> </a></td>
<!-- <td><?php echo $d->PONO ?></td> --> <!-- <td><?php echo $d->PONO ?></td> -->
<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> <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>
<td><?php echo $d->POType ?></td><!-- Department --> <td><?php echo $d->POType ?></td><!-- Department -->
<td><?php echo $d->MaterialCode ?></td><!-- Material Code --> <td><?php echo $d->MaterialCode ?></td><!-- Material Code -->
<td><?php echo $d->MaterialName ?></td><!-- Material Name --> <td><?php echo $d->MaterialName ?></td><!-- Material Name -->