From efe5e4ded42b419a9990d9e4a199ce96304328aa Mon Sep 17 00:00:00 2001 From: gandhimathi Bharathirajan Date: Wed, 6 Sep 2017 12:06:39 +0530 Subject: [PATCH] Available budget amouunt issue fixed --- application/models/purchaseorder_model.php | 2 +- application/models/requistion_model.php | 26 +++++++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index c01f91bd..229294c6 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -235,7 +235,7 @@ function purchaseorderListing($forwhat='') { $subQuery='select BudgetAmount,(select ifnull(sum((Quantity*Rate*ExchangeRate)),0)as TValue from T_PurchaseOrder_LineItem LineItem join T_PurchaseOrder_Master Mast on Mast.PONO=LineItem.PONO where POType=? - and CostCenterCode=? and Mast.status not in (?) )as TotalValue from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and BudgetYear=? and BudgetType=?'; + and CostCenterCode=? and Mast.status not in (?) )as Totalvalue from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and BudgetYear=? and BudgetType=?'; $query = $this->db->query($subQuery,array($BudgetType,$CostCode,PO_AMENDED,$CostCode,$Year,$BudgetType)); //print_r($this->db->last_query()); return $query->result_array(); diff --git a/application/models/requistion_model.php b/application/models/requistion_model.php index 1ec16f18..59f24f73 100755 --- a/application/models/requistion_model.php +++ b/application/models/requistion_model.php @@ -328,21 +328,27 @@ ifnull(Po.Quantity,0) as POQTY,sta.StatusName function getRequistItemList($ReqID,$NoArray='') { - $subQuery = 'select distinct Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,sum(Po.Quantity) as POQTY,sta.StatusName from T_MaterialMaster Mat + /* $subQuery = 'select distinct Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,sum(Po.Quantity) as POQTY,sta.StatusName from T_MaterialMaster Mat left join T_Requestion_Details Req on Req.MaterialCode = Mat.MaterialCode left join T_PurchaseOrder_LineItem Po on Po.ReqNo = Req.ReqNo and Po.MaterialCode = Req.MaterialCode left join T_Status sta on sta.StatusCode = Req.Status where Req.ReqNo=? group by Po.ReqNo,Req.MaterialCode'; - $query = $this->db->query($subQuery, array($ReqID)); - if($NoArray == '') - { - return $query->result_array(); - } - else - { - return $query->result(); - } + $query = $this->db->query($subQuery, array($ReqID)); */ + + $result ->next_result(); + + if($result->num_rows > 0) + { + if($NoArray == '') + { + return $result->result_array(); + } + else + { + return $result->result(); + } + } } /**