diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php index 76e618b4..f9132e8a 100755 --- a/application/controllers/emergencypurchaseorder.php +++ b/application/controllers/emergencypurchaseorder.php @@ -679,7 +679,7 @@ $RequestedBy = $this->input->post('drpDepartment'); $igr = array(); - $igr = array('PONO'=>$PONO,'VehicleNo'=>$Vehicle,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'CourierNo'=>$Courier,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt); + $igr = array('PONO'=>$PONO,'VehicleNo'=>$Vehicle,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'MaterialRcvdDate'=>$DeliveryChellanDate,'CourierNo'=>$Courier,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt); //print_r($igr); diff --git a/application/controllers/inwardgateregister.php b/application/controllers/inwardgateregister.php index 5ef2be3a..b22a9728 100644 --- a/application/controllers/inwardgateregister.php +++ b/application/controllers/inwardgateregister.php @@ -250,7 +250,10 @@ class inwardgateregister extends BaseController $DeliveryChellan = $this->input->post('InvoiceDate'); $DeliveryChellanDate = $this->getDateformat($DeliveryChellan); - + + $Mat_Rcvd_Dt = $this->input->post('MaterialRcvdDate'); + $MaterialRcvdDt = $this->getDateformat($Mat_Rcvd_Dt); + $VehicleNo = $this->input->post('VehicleNo'); $CourierNo = $this->input->post('CourierNo'); @@ -285,7 +288,7 @@ class inwardgateregister extends BaseController $igr = array(); - $igr = array('PONO'=>$PONO,'VehicleNo'=>$VehicleNo,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'CourierNo'=>$CourierNo,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt,'file'=>$document); + $igr = array('PONO'=>$PONO,'VehicleNo'=>$VehicleNo,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'MaterialRcvdDate'=>$MaterialRcvdDt,'CourierNo'=>$CourierNo,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt,'file'=>$document); //print_r($igr);die(); $igrM = $this->inwardgateregister_model->addigrM($igr); diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 4b4f9a04..854cce79 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -1639,7 +1639,7 @@ $sql.="group by pono,material_name,category,supplier_name"; function ireport_attachment($cname,$fa,$aa,$m,$frm,$t){ - $sql="select pono,potype,date_format(created_date,'%d-%m-%Y') as created_date,supplier_name, + $sql="select pono,potype,date_format(created_date,'%d-%m-%Y') as created_date,date_format(materialrcvddate,'%d-%m-%Y') as materialrcvddate,supplier_name, sum(total) as total,file,ifile from igr where status != 'ST030' diff --git a/application/views/Report_attach_inward.php b/application/views/Report_attach_inward.php index dbada44b..e12c66de 100755 --- a/application/views/Report_attach_inward.php +++ b/application/views/Report_attach_inward.php @@ -195,9 +195,10 @@ if(!empty($mms)) PO No - Date + IGR Created Date + Material Received Date Supplier Name - Total  () + Total  () Attachments @@ -216,6 +217,7 @@ if(!empty($mms)) created_date;?> + materialrcvddate;?> supplier_name;?> @@ -289,6 +291,7 @@ if(!empty($mms)) + - + \ No newline at end of file diff --git a/application/views/viewinwardgateregister.php b/application/views/viewinwardgateregister.php index 378c80d1..06e2021b 100755 --- a/application/views/viewinwardgateregister.php +++ b/application/views/viewinwardgateregister.php @@ -1,6 +1,4 @@ - - -