From 6e9a578753a4ab3053c1d8be78a669342568fdb3 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 10 Aug 2017 17:41:48 +0530 Subject: [PATCH] mrir billing delivery date --- application/models/mrir_model.php | 2 +- application/views/viewmrirforbilling.php | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php index 5bfe003d..fde322e3 100755 --- a/application/models/mrir_model.php +++ b/application/models/mrir_model.php @@ -220,7 +220,7 @@ TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount '); /* This function is used to get the value for modal in view MRIR page */ function get_MRIRs($mrir) { - $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMD.*,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRD.*,SUPP.SupplierName,SUPP.Address,POMR.DeliveryDate,POMR.ServiceDescription,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity'); + $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMD.*,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRD.*,SUPP.SupplierName,SUPP.Address,POMR.DeliveryDate,POMR.ServiceDescription,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity,POMR.POType'); $this->db->from ('T_MRIR_Master TMM'); $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO'); $this->db->join ('T_MaterialMaster MM','TMD.MaterialCode = MM.MaterialCode'); diff --git a/application/views/viewmrirforbilling.php b/application/views/viewmrirforbilling.php index e3d207f6..1d2450b8 100755 --- a/application/views/viewmrirforbilling.php +++ b/application/views/viewmrirforbilling.php @@ -347,6 +347,12 @@ $color=''; var ddate = new Date(item.DeliveryDate); //alert(ddate.getDate()+ '.' + (ddate.getMonth() + 1)+ '.' + ddate.getFullYear()); var ddate2 = (ddate.getDate()+ '.' + (ddate.getMonth() + 1)+ '.' + ddate.getFullYear()); + var Potype=item.POType; + //alert(Potype); + if(Potype=='CAPITAL' || Potype=='IMPORT') + { + var ddate2=''; + } //$("#DeliveryDate").val(dout.toString('M-d-yyyy')); $("#DeliveryDate").val(ddate2); $("#SupplierName").val(item.SupplierName);