From c2649e762973c873dbd8e7d0c5a4834ed9958438 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 8 Nov 2017 17:06:27 +0530
Subject: [PATCH] advance request department

---
 application/models/purchaseorder_model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index 69a4f72d..0677f516 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -1572,18 +1572,18 @@ left join T_Employee_Details emp on Req.Requestedby = emp.EmpID
 
      function getadvancePONO($Status='')
     {
-        $this->db->select ('Mast.PONO,POType,Mast.CreatedDate,Mast.ReleasedOn,Mast.TotalOrderValue,Mast.SupplierID,DeliveryDate,DeliverySchedule,DeliveryOption,Mast.PaymentTerms as Paycode,Payterm.PaymentTerms,LineItem.ReqNo,Requestedby,Departmentcode,DepartmentName,LineItem.CostCenterCode,SupDet.SupplierName,Import_DispatchDetails,CurrencyType,AdvancePercentage,AdvanceAmount,POAdv.Remarks,Mast.CapitalRange,Mast.PaymentOtherDescription');
+        $this->db->select ('Mast.PONO,POType,Mast.CreatedDate,Mast.ReleasedOn,Mast.TotalOrderValue,Mast.SupplierID,DeliveryDate,DeliverySchedule,DeliveryOption,Mast.PaymentTerms as Paycode,Payterm.PaymentTerms,LineItem.ReqNo,Requestedby,Departmentcode,DepartmentName,LineItem.CostCenterCode,SupDet.SupplierName,Import_DispatchDetails,CurrencyType,AdvancePercentage,AdvanceAmount,POAdv.Remarks,Mast.CapitalRange,Mast.PaymentOtherDescription,RequestedDept');
         $this->db->from('T_PurchaseOrder_Master Mast');
         $this->db->join('T_PurchaseOrder_LineItem LineItem','Mast.PONO=LineItem.PONO');
         $this->db->join('T_Requestion_Master ReqMa','LineItem.ReqNo=ReqMa.ReqNo');
         $this->db->join('T_Employee_Details EmpDet','ReqMa.Requestedby=EmpDet.EmpID','left');
-        $this->db->join('T_DepartmentDetails DepDet','EmpDet.Departmentcode=DepDet.DEPCode','left');
+        $this->db->join('T_DepartmentDetails DepDet','EmpDet.Departmentcode=DepDet.DEPCode or ReqMa.RequestedDept=DepDet.DEPCode','left');
         $this->db->join('T_SupplierDetailsN SupDet','Mast.SupplierID=SupDet.SupplierID');
         $this->db->join('T_PurchaseOrder_AdvanceRequest POAdv','Mast.PONO=POAdv.PONO','left');
         $this->db->join('T_PaymentTerms Payterm','Mast.PaymentTerms=Payterm.PaymentID');
         $this->db->where('Mast.Status',$Status);
         $query = $this->db->get();
-        //print_r($this->db->last_query());
+       // print_r($this->db->last_query());
         return $query->result();
 
     }