diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index ad9fe6e7..c7125202 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -1233,7 +1233,7 @@ function GetCurrencytype() { $this->db->distinct(); - $this->db->select('mast.PONO,mast.TotalOrderValue,st.StatusCode,st.StatusName,emp.FirstName,mast.CreatedDate,ccm.CostCenterName,ccm.CostCenterCode,mast.POType as ReqType,mast.Remarks,DepartmentName,mast.ApprovedBy,(select EmpID from tbl_users where userId=mast.ApprovedBy )as EID, + $this->db->select('mast.PONO,mast.TotalOrderValue,st.StatusCode,st.StatusName,emp.FirstName,mast.CreatedDate,ccm.CostCenterName,ccm.CostCenterCode,mast.POType as RType,mast.Remarks,DepartmentName,mast.ApprovedBy,(select EmpID from tbl_users where userId=mast.ApprovedBy )as EID,rmast.ReqType,mast.Status, (select FirstName from T_Employee_Details where EmpID=EID)as Approver'); $this->db->from('T_PurchaseOrder_Master mast'); // $this->db->order_by('mast.Status',"PO_CREATED"); diff --git a/application/views/poapproval_view.php b/application/views/poapproval_view.php index 0a1de42f..c5308f41 100755 --- a/application/views/poapproval_view.php +++ b/application/views/poapproval_view.php @@ -58,12 +58,24 @@ if(empty($Status))