diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index c04fe188..2154a478 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -1056,7 +1056,8 @@ public function importpoprint($PONO) $Currencycode=''; $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation(); $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO); - //print_r( $data['POItem']); + $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); + //print_r( $data['releasedetails']); foreach ($data['POItem'] as $Reqdby) { $Requester=$Reqdby->Requestedby; @@ -1150,7 +1151,7 @@ public function importpoprint($PONO) $this->dompdf->load_html($php); $this->dompdf->render(); $data['Attachment'] = FALSE; - //$this->dompdf->stream("ImportPOReport.pdf",$data,$php); + $this->dompdf->stream("ImportPOReport.pdf",$data,$php); } diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 71805a40..ddc6d936 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -1120,7 +1120,8 @@ function GetCurrencytype() $this->db->join('T_Employee_Details re','re.EmpID=tbl.EmpID'); $this->db->where('mast.PONO',$PONO); $result=$this->db->get(); - + //print_r($this->db->last_query()); +//die(); return $result->result(); } diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 0e2435f9..bc92ac45 100644 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -119,8 +119,8 @@ if(!empty($POMaster)) $PaymentDays=$Req->PaymentDays; $StatusName=$Req->StatusName; $Currency_Type=$Req->CurrencyType; - $parentPO =$Req->ParentPO; - $DeliverySchedule=$Req->DeliverySchedule; + $parentPO =$Req->ParentPO; + $DeliverySchedule=$Req->DeliverySchedule; } } //echo $ServiceDescription; @@ -4360,10 +4360,10 @@ $('.EditImport').click(function(){ var cellval = tr.cells; - cellval[3].innerHTML = editQuantity; - cellval[4].innerHTML =editUOM; - cellval[5].innerHTML =itemRate; - cellval[6].innerHTML =BasicValue; + cellval[4].innerHTML = editQuantity; + cellval[5].innerHTML =editUOM; + cellval[6].innerHTML =itemRate; + cellval[7].innerHTML =BasicValue; $('#materialCode'+userid).val(editMaterialCode); $('#materialName'+userid).val(edititemname); diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php index dccb03f3..1560a5ea 100755 --- a/application/views/importpopdf.php +++ b/application/views/importpopdf.php @@ -361,7 +361,46 @@

-

Service Description:

+
Service Description:

+ ReleasedOn, new DateTimeZone('Asia/Kolkata')); + + + ?> + + + + + + + + + + + + + +
ReleasedBy:ReleasedOn:
FirstName;?>format('d-m-Y');?>
+ + + + + + + + + +
Till Release State:
+ + \ No newline at end of file