From c076aa7f1b82a52da1ce32a5dfd105f273dd5557 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 7 Aug 2017 14:43:03 +0530 Subject: [PATCH] mrir --- application/models/purchaseorder_model.php | 3 ++- application/views/Amendedimportpopdf.php | 2 +- application/views/importpopdf.php | 2 +- application/views/mririmportpopdf.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 8d3ec162..d728c889 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -738,7 +738,7 @@ function GetImportPurchaseOrderDetailsForPDF($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 ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,AdvanceAmount +ProductPrice,Tax.*,LineItem.CostCenterCode ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,AdvanceAmount, Pay.PaymentTerms as Pay FROM T_PurchaseOrder_LineItem LineItem join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode @@ -747,6 +747,7 @@ join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID left join T_PurchaseOrder_AdvanceRequest PurAdv on POMaster.PONO=PurAdv.PONO join T_Requestion_Master ReqMast on LineItem.ReqNo=ReqMast.ReqNo +join T_PaymentTerms Pay on POMaster.PaymentTerms=Pay.PaymentID where LineItem.PONO =?'; $query = $this->db->query($subQuery,array($PONO)); diff --git a/application/views/Amendedimportpopdf.php b/application/views/Amendedimportpopdf.php index e2676967..0fa3cdb6 100755 --- a/application/views/Amendedimportpopdf.php +++ b/application/views/Amendedimportpopdf.php @@ -52,7 +52,7 @@ //$ReqBy=$PO->Requestedby; $TotalOrderValue1=$PO->TotalOrderValue; - $PaymentTerms = $PO->PaymentTerms; + $PaymentTerms = $PO->Pay; //$PaymentDays=$PO->PaymentDays; //$PayableAT=$PO->PayableAT; $PlaceofOrigin=$PO->Import_PlaceofOrgin; diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php index 927b5549..a78d0190 100755 --- a/application/views/importpopdf.php +++ b/application/views/importpopdf.php @@ -54,7 +54,7 @@ $CostCenterCode=$PO->CostCenterCode; //$ReqBy=$PO->Requestedby; - $PaymentTerms = $PO->PaymentTerms; + $PaymentTerms = $PO->Pay; $Placeoforigin=$PO->Import_PlaceofOrgin; $Import_DispatchDetails=$PO->Import_DispatchDetails; diff --git a/application/views/mririmportpopdf.php b/application/views/mririmportpopdf.php index 50d9b338..a984273a 100755 --- a/application/views/mririmportpopdf.php +++ b/application/views/mririmportpopdf.php @@ -56,7 +56,7 @@ $CostCenterCode=$PO->CostCenterCode; //$ReqBy=$PO->Requestedby; - $PaymentTerms = $PO->PaymentTerms; + $PaymentTerms = $PO->Pay; $Placeoforigin=$PO->Import_PlaceofOrgin; $Import_DispatchDetails=$PO->Import_DispatchDetails;