SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mrir billing delivery date

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-10 17:41:48 +05:30
parent b99b2a282b
commit 6e9a578753
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/mrir_model.php
View File

@ -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 */ /* This function is used to get the value for modal in view MRIR page */
function get_MRIRs($mrir) 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->from ('T_MRIR_Master TMM');
$this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO'); $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO');
$this->db->join ('T_MaterialMaster MM','TMD.MaterialCode = MM.MaterialCode'); $this->db->join ('T_MaterialMaster MM','TMD.MaterialCode = MM.MaterialCode');

6
application/views/viewmrirforbilling.php
View File

@ -347,6 +347,12 @@ $color='';
var ddate = new Date(item.DeliveryDate); var ddate = new Date(item.DeliveryDate);
//alert(ddate.getDate()+ '.' + (ddate.getMonth() + 1)+ '.' + ddate.getFullYear()); //alert(ddate.getDate()+ '.' + (ddate.getMonth() + 1)+ '.' + ddate.getFullYear());
var ddate2 = (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(dout.toString('M-d-yyyy'));
$("#DeliveryDate").val(ddate2); $("#DeliveryDate").val(ddate2);
$("#SupplierName").val(item.SupplierName); $("#SupplierName").val(item.SupplierName);