diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index ca05c563..1b1aa935 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -1599,14 +1599,14 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode } // get capital tax listing by po no - function GetCapitalTaxListDetails($PONO = '',$CapitalRange=''){ + function GetCapitalTaxListDetails($PONO = '',$CapitalRange=''){ if($CapitalRange==1){ $taxQuery ='SELECT group_concat(pl.MaterialCode ORDER BY pl.MaterialCode ASC) as Itemcode,SUM(st.`After_CGST`) AS TotalCGST,SUM(st.`After_SGST`) AS TotalSGST,SUM(st.`After_IGST`) AS TotalIGST,SUM(st.`otherallowance`) AS TotalOtherAllowance,SUM(st.`Afterdiscountval`) AS TotalDiscount,st.discountval,st.Afterdiscountval,st.CGST,st.SGST,st.IGST,st.otherallowance FROM kasiram9_SIADEV.T_Service_Tax st join T_PurchaseOrder_LineItem pl on pl.LineItemNo=st.LineItemNo join T_PurchaseOrder_Master pm on pm.PONO=pl.PONO where pm.POType=? and pm.PONO=? - group by st.discountval,st.CGST,st.SGST,st.IGST,st.otherallowance ORDER BY st.LineItemNo ASC'; + group by st.Afterdiscountval,st.CGST,st.SGST,st.IGST,st.otherallowance ORDER BY st.LineItemNo ASC'; $query = $this->db->query($taxQuery,array("CAPITAL",$PONO)); return $query->result(); @@ -1616,7 +1616,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode join T_PurchaseOrder_LineItem pl on pl.LineItemNo=it.LineItemNo join T_PurchaseOrder_Master pm on pm.PONO=pl.PONO where pm.POType=? and pm.PONO=? - group by it.FreightValue ORDER BY it.LineItemNo ASC'; + group by it.AfterFreightValue ORDER BY it.LineItemNo ASC'; $query = $this->db->query($taxQuery,array("CAPITAL",$PONO)); return $query->result(); diff --git a/application/views/capitalpopdf.php b/application/views/capitalpopdf.php index 16523f90..aee12506 100755 --- a/application/views/capitalpopdf.php +++ b/application/views/capitalpopdf.php @@ -245,7 +245,7 @@ format("d-m-Y"); echo $date; ?> Dept: CCD: - Fin cap: + Fin cap: @@ -254,8 +254,8 @@
-

Mode of Shipment: By road

-

Insurance :

+

Mode of Shipment:

+

Insurance :

Please arrange to deliver the materials listed below as per schedule to our works

@@ -396,11 +396,11 @@ $TotalFreight='-'; ?> - + - + - + @@ -477,4 +477,4 @@ - \ No newline at end of file +
discountval;?>TotalDiscount;?> CGST;?> SGST;?> IGST;?>otherallowance;?>TotalOtherAllowance;?> FreightValue;?>TotalFreight;?>