From 6c01a48ad69e0134742d9d46b8e67aee34d8321c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 28 Sep 2017 18:15:54 +0530 Subject: [PATCH] service po requistion level new changes done --- application/models/purchaseorder_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index d5ca4c5a..7e60f059 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -752,7 +752,7 @@ function GetPOType($ReqNo) function getRevenueTaxinforforpdf($PONO) { - $subQuery ='SELECT group_concat(pl.MaterialCode ORDER BY pl.MaterialCode ASC) as Itemcode,rt.CGST,rt.SGST,rt.IGST,rt.FreightValue,rt.PackagingValue,rt.DiscountValue FROM T_Revenue_Tax rt + $subQuery ='SELECT group_concat(pl.MaterialCode ORDER BY pl.MaterialCode ASC) as Itemcode,rt.CGST,rt.SGST,rt.IGST,rt.FreightValue,rt.PackagingValue,rt.DiscountValue,rt.AfterDiscount FROM T_Revenue_Tax rt join T_PurchaseOrder_LineItem pl on pl.LineItemNo=rt.LineItemNo @@ -760,7 +760,7 @@ function GetPOType($ReqNo) where pm.POType=? and pm.PONO=? - group by rt.CGST,rt.SGST,rt.IGST,rt.FreightValue,rt.PackagingValue ORDER BY rt.LineItemNo ASC'; + group by rt.CGST,rt.SGST,rt.IGST,rt.FreightValue,rt.PackagingValue,rt.AfterDiscount ORDER BY rt.LineItemNo ASC'; $query = $this->db->query($subQuery,array("REVENUE",$PONO));