diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php index 7eeae2f7..935d2caf 100755 --- a/application/models/mrir_model.php +++ b/application/models/mrir_model.php @@ -100,16 +100,21 @@ function ViewDistributionList() return $query->result(); } /* This function is used to list the MRIR value*/ - function view_mrir_Billing() + function view_mrir_Billing() { $this->db->distinct(); - $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID,TMD.PlantInchargeID,TMD.UpdateBY,POM.PODate,POM.POType,POM.ReleasedBy,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'); + $this->db->select('TMM.MRIRNO,TMM.PONO, TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo, +IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID, +TMD.PlantInchargeID,TMD.UpdateBY, POM.PODate,POM.POType,POM.ReleasedBy, +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 '); $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'); - $this->db->join ('T_IGR_Details IGRD','IGRM.IGRNO=IGRD.IGRNO'); + $this->db->join ('T_IGR_Details IGRD','IGRM.IGRNO=IGRD.IGRNO and IGRD.MaterialCode = TMD.MaterialCode'); $this->db->join ('T_PurchaseOrder_Master POM','POM.PONO=IGRM.PONO'); - $this->db->join ('T_PurchaseOrder_LineItem POL','POL.PONO=POM.PONO'); + $this->db->join ('T_PurchaseOrder_LineItem POL','POL.PONO=POM.PONO and TMD.MaterialCode = POL.MaterialCode'); $this->db->join('T_PurchaseOrder_AdvanceRequest PUADV','POM.PONO=PUADV.PONO','left'); $this->db->join ('tbl_users user','user.userid=TMD.UpdateBY'); $this->db->join ('T_Employee_Details ED','ED.EmpID = user.EmpID'); @@ -120,7 +125,7 @@ function ViewDistributionList() $this->db->where('TMM.MRIRStatus',MRIR_APPROVED); $this->db->order_by('TMM.MRIRNO','asc'); $query = $this->db->get(); - //print_r($this->db->last_query()); + //print_r($this->db->last_query()); return $query->result(); } diff --git a/application/views/rawmaterialListing.php b/application/views/rawmaterialListing.php index 2ab817ce..5c2d63c6 100755 --- a/application/views/rawmaterialListing.php +++ b/application/views/rawmaterialListing.php @@ -21,7 +21,7 @@ Material Code - Raw Material Code + Material Description Type of Material Unit Of Measurement @@ -44,8 +44,8 @@ - MaterialCode ?> - RMCode ?> + + RMCode ?> MaterialName ?> MaterialType ?> UOM ?> diff --git a/application/views/viewmrirforbilling.php b/application/views/viewmrirforbilling.php index 65978ba0..e3d207f6 100755 --- a/application/views/viewmrirforbilling.php +++ b/application/views/viewmrirforbilling.php @@ -367,7 +367,7 @@ $color=''; ''+item.ActualQuantityReceived+ ''+item.QuantityAccepted+ ''+item.QuantityRejected+ - ''+item.Remarks1+ + ''+item.Remarks+ '';