From a806cee92a89575022406a688bba3ce1aa6fa4a2 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 8 Aug 2017 12:04:37 +0530 Subject: [PATCH] mrir pdf --- application/models/purchaseorder_model.php | 6 +++--- application/views/Amendedimportpopdf.php | 2 +- application/views/importpopdf.php | 2 +- application/views/mrirrevenuepopdf.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 0c6dd912..28694087 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -609,7 +609,7 @@ function purchaseorderListing($forwhat='') $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.ServiceMaterialDescription,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Mat.HSNCODE, LineItem.Quantity,LineItem.Rate,(LineItem.Quantity *LineItem.Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount - ,TotalValue,CGST,SGST,IGST,After_CGST,After_SGST,After_IGST,otherallowance,LineItem.CostCenterCode,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.Status,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription,POMaster.PaymentOtherDescription,POMaster.DeliveryOption,POMaster.DeliverySchedule,ReqMat.NumberOfService,ReqMat.Service_Period,ReqMat.Schedule_Type,Payment.PaymentID,Payment.PaymentTerms,AdvanceAmount FROM + ,TotalValue,CGST,SGST,IGST,After_CGST,After_SGST,After_IGST,otherallowance,LineItem.CostCenterCode,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.Status,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription,POMaster.PaymentOtherDescription,POMaster.DeliveryOption,POMaster.DeliverySchedule,ReqMat.NumberOfService,ReqMat.Service_Period,ReqMat.Schedule_Type,Payment.PaymentID,Payment.PaymentTerms,AdvanceAmount,HSNCODE FROM T_PurchaseOrder_LineItem LineItem join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo @@ -681,7 +681,7 @@ function purchaseorderListing($forwhat='') Mat.UOM,Mat.HSNCODE,Quantity,Rate,(Quantity *Rate) as BasicValue , (AfterPackagingValue + AfterFreightValue + AfterSGST + AfterCGST + AfterIGST + Insurance) as Taxamount,AdvanceAmount, - TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentID,Payment.PaymentTerms + TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentID,Payment.PaymentTerms,HSNCODE FROM T_PurchaseOrder_LineItem LineItem join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo @@ -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, Pay.PaymentTerms as Pay,ROUND((Quantity *Rate),2 ) as BasicValue +ProductPrice,Tax.*,LineItem.CostCenterCode ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,AdvanceAmount, Pay.PaymentTerms as Pay,ROUND((Quantity *Rate),2 ) as BasicValue,HSNCODE FROM T_PurchaseOrder_LineItem LineItem join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode diff --git a/application/views/Amendedimportpopdf.php b/application/views/Amendedimportpopdf.php index db25aa48..f0b1a843 100755 --- a/application/views/Amendedimportpopdf.php +++ b/application/views/Amendedimportpopdf.php @@ -228,7 +228,7 @@ MaterialName ; ?> - 000666 + HSNCODE;?> UOM ; ?> Quantity ; ?> diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php index a53bdd0a..82344192 100755 --- a/application/views/importpopdf.php +++ b/application/views/importpopdf.php @@ -232,7 +232,7 @@ MaterialName ; ?> - 000666 + HSNCODE;?> Quantity ; ?> UOM ; ?> diff --git a/application/views/mrirrevenuepopdf.php b/application/views/mrirrevenuepopdf.php index 2e8d38bb..b49e3766 100755 --- a/application/views/mrirrevenuepopdf.php +++ b/application/views/mrirrevenuepopdf.php @@ -195,7 +195,7 @@ 001 MaterialName ; ?> - 000666 + HSNCODE;?> UOM ; ?> Quantity ; ?>