From e90e49c4b25072c6cfcd0dd1c01248a8a676769d Mon Sep 17 00:00:00 2001
From: venbatechnologies <venbatechnologies@gmail.com>
Date: Thu, 8 Mar 2018 14:02:11 +0530
Subject: [PATCH] change MIR

---
 application/models/user_model.php             |  3 ++-
 .../views/Report_Material_inward_Register.php | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/application/models/user_model.php b/application/models/user_model.php
index 9dbc246d..9d5f036d 100644
--- a/application/models/user_model.php
+++ b/application/models/user_model.php
@@ -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);
diff --git a/application/views/Report_Material_inward_Register.php b/application/views/Report_Material_inward_Register.php
index 392f4a99..a7959d2c 100644
--- a/application/views/Report_Material_inward_Register.php
+++ b/application/views/Report_Material_inward_Register.php
@@ -184,19 +184,37 @@
 					   <td><?php echo $gmir->Quantity;?></td>
 					     <td><?php echo $gmir->ReceivedQuantity;?></td>
 
+					    
+
               <td style="text-align:right;"><?php 
+
+              if ($gmir->Quantity  >= $gmir->ReceivedQuantity){
+
                 $Quantity= round($gmir->Quantity);
                    $ReceivedQuantity= round($gmir->ReceivedQuantity);
                    $Shortage=$Quantity - $ReceivedQuantity;
 
 
-                echo   $Shortage;  ?></td>  
+                echo   $Shortage;} else  ?></td> 
 
                 <!-- number_format($Rating, 2, '.', ' ') -->
                <!--  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->DeliveryChellanDate;?></td>
 					   <td><?php echo $gmir->VehicleNo;?></td>