RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change MIR

Browse Source
This commit is contained in:
venbatechnologies 2018-03-08 14:02:11 +05:30
parent 7a4bcc30c9
commit e90e49c4b2
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/models/user_model.php
View File

@ -249,8 +249,9 @@ where igrm.IGRStatus ='ST027'";
} }
$sql.="group by igrm.CreatedDate";
//$sql.="order by igrm.CreatedDate";
$sql.="order by igrm.CreatedDate";
$query = $this->db->query($sql); $query = $this->db->query($sql);

22
application/views/Report_Material_inward_Register.php
View File

@ -184,19 +184,37 @@
<td><?php echo $gmir->Quantity;?></td> <td><?php echo $gmir->Quantity;?></td>
<td><?php echo $gmir->ReceivedQuantity;?></td> <td><?php echo $gmir->ReceivedQuantity;?></td>
<td style="text-align:right;"><?php <td style="text-align:right;"><?php
if ($gmir->Quantity >= $gmir->ReceivedQuantity){
$Quantity= round($gmir->Quantity); $Quantity= round($gmir->Quantity);
$ReceivedQuantity= round($gmir->ReceivedQuantity); $ReceivedQuantity= round($gmir->ReceivedQuantity);
$Shortage=$Quantity - $ReceivedQuantity; $Shortage=$Quantity - $ReceivedQuantity;
echo $Shortage; ?></td> echo $Shortage;} else ?></td>
<!-- number_format($Rating, 2, '.', ' ') --> <!-- number_format($Rating, 2, '.', ' ') -->
<!-- h:i:sa --> <!-- h:i:sa -->
<td><?php echo $gmir->AmendmentQuantity;?></td> <td><?php
{
$Quantity= round($gmir->Quantity);
$ReceivedQuantity= round($gmir->ReceivedQuantity);
$Excess= $ReceivedQuantity -$Quantity ;
echo $Excess;}?></td>
<td><?php echo $gmir->DeliveryChellanOrInvoiceNo;?></td> <td><?php echo $gmir->DeliveryChellanOrInvoiceNo;?></td>
<td><?php echo $gmir->DeliveryChellanDate;?></td> <td><?php echo $gmir->DeliveryChellanDate;?></td>
<td><?php echo $gmir->VehicleNo;?></td> <td><?php echo $gmir->VehicleNo;?></td>