From bba435fe34ae0d1a17cc26ab13ce10b4f5d7a7e7 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 30 Jan 2018 10:03:08 +0530
Subject: [PATCH] mrir actualquantity

---
 application/models/mrir_model.php                  | 2 +-
 application/views/viewmaterialinspectionreport.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php
index 7c9f9298..8c13d47b 100644
--- a/application/models/mrir_model.php
+++ b/application/models/mrir_model.php
@@ -100,7 +100,7 @@ class mrir_model extends CI_Model
         function view_mrir()
         {
             $this->db->distinct();
-            $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.MRIRStatus,ST.StatusName,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID,TMD.PlantInchargeID,TMD.UpdateBY,POM.PODate,POM.POType,POM.CreatedBy,ED.FirstName as UpdatedbyName,ED1.FirstName as CreatedByName');
+            $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.MRIRStatus,ST.StatusName,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID,TMD.PlantInchargeID,TMD.UpdateBY,POM.PODate,POM.POType,POM.CreatedBy,ED.FirstName as UpdatedbyName,ED1.FirstName as CreatedByName,TMD.ActualQuantityReceived');
             $this->db->from ('T_MRIR_Master TMM'); 
             $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO=TMD.MRIRNO');
             $this->db->join ('T_IGR_Master IGRM','TMM.IGRNO=IGRM.IGRNO');
diff --git a/application/views/viewmaterialinspectionreport.php b/application/views/viewmaterialinspectionreport.php
index e4fcaec6..e259be0a 100644
--- a/application/views/viewmaterialinspectionreport.php
+++ b/application/views/viewmaterialinspectionreport.php
@@ -32,9 +32,10 @@
 							<th>PO Raised By</th>
 							<th>Invoice No</th> 
 							<th>Invoice Date</th>
+							<th>Actual Quantity</th>
 							<th>Vehicle No</th>
 							<th>Courier No</th>
-                                                        <th>MRIR Status</th>
+                            <th>MRIR Status</th>
 							<th>Updated By</th>
 							<th>Action</th>
 						  						  
@@ -62,6 +63,7 @@
 						<td align="right"><?php
                                   $date = new DateTime($d->DeliveryChellanDate);
                                   echo $date->format('d-m-Y'); ?></td>
+						<td><?php echo $d->ActualQuantityReceived ?></td>
 						<td><?php echo $d->VehicleNo ?></td>
 						<td><?php echo $d->CourierNo ?></td>
                                                 <td><?php echo $d->StatusName ?></td>