diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 1364c628..dce940a6 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -1142,17 +1142,17 @@ public function importpoprint($PONO) //s $this->load->view('includes/pdffooter'); // Get output html - $php = $this->output->get_output(); + $php = $this->output->get_output(); // Load library - $this->load->library('dompdf_gen'); + $this->load->library('dompdf_gen'); // Convert to PDF //$this->dompdf->set_paper(array(0, 0, 841.89, 1190.55), 'landscape'); - $this->dompdf->load_html($php); + $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 fee5542e..14aa648c 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -588,16 +588,27 @@ function purchaseorderListing($forwhat='') function GetImportPurchaseOrderDetailsForPDF($PONO = '') { - $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName, - Mat.UOM,Quantity,ReqMas.Requestedby,Rate,ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount , - ProductPrice,Tax.*,LineItem.CostCenterCode , POMaster.*,sup.SupplierName,sup.Address - FROM T_PurchaseOrder_LineItem LineItem - join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo - join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode - join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo - join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO - join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID - where LineItem.PONO =?'; + // $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName, + // Mat.UOM,Quantity,ReqMas.Requestedby,Rate,ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount, + // ProductPrice,Tax.*,LineItem.CostCenterCode , POMaster.*,sup.SupplierName,sup.Address + // FROM T_PurchaseOrder_LineItem LineItem + // join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo + // join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode + // join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo + // join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO + // join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID + // where LineItem.PONO =?'; + + $subQuery='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName,Import_DispatchDetails, +Mat.UOM,Quantity,ReqMas.Requestedby,Rate,ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount , +ProductPrice,Tax.*,LineItem.CostCenterCode , POMaster.*,sup.SupplierName,sup.Address +FROM T_PurchaseOrder_LineItem LineItem +join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo +join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode +join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo +join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO +join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID +where LineItem.PONO =?'; $query = $this->db->query($subQuery,array($PONO)); diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php index 48cb6660..7e7fc4b2 100644 --- a/application/views/importpopdf.php +++ b/application/views/importpopdf.php @@ -148,7 +148,7 @@ PO DATE : - DELIVERY DATE / SCHEDULE BY : + DELIVERY DATE / SCHEDULE BY : PLACE OF ORIGIN :