SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Department Issue fixed

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-07-30 03:41:24 +05:30
parent ec5eb11606
commit 2ac3a878b5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
application/models/purchaseorder_model.php
View File

@ -242,8 +242,10 @@ function purchaseorderListing($forwhat='')
from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and
BudgetYear = ? and BudgetType =?'; */ BudgetYear = ? and BudgetType =?'; */
$subQuery ='select BudgetAmount, (select ifnull(sum(Quantity*Rate),0) as Totalvalue from $subQuery ='select BudgetAmount, (select ifnull(sum(Quantity*Rate)-tax.AfterDiscount,0) as Totalvalue from
T_PurchaseOrder_LineItem Item join T_Requestion_Master mast on mast.ReqNo = Item.ReqNo where Item.CostCenterCode=? and mast.ReqType=?)as Totalvalue T_PurchaseOrder_LineItem Item join T_Requestion_Master mast
on mast.ReqNo = Item.ReqNo left join T_Revenue_Tax tax on
tax.LineItemNo = Item.LineItemNo where Item.CostCenterCode=? and mast.ReqType=?)as Totalvalue
from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and
BudgetYear = ? and BudgetType =?'; BudgetYear = ? and BudgetType =?';
@ -1242,13 +1244,14 @@ function GetCurrencytype()
$this->db->from('T_PurchaseOrder_Master mast'); $this->db->from('T_PurchaseOrder_Master mast');
// $this->db->order_by('mast.Status',"PO_CREATED"); // $this->db->order_by('mast.Status',"PO_CREATED");
$this->db->join('T_Status st', 'st.StatusCode=mast.Status'); $this->db->join('T_Status st', 'st.StatusCode=mast.Status');
$this->db->join('tbl_users tbl', 'mast.createdby=tbl.userid');
$this->db->join('T_Employee_Details as emp', 'emp.empid=tbl.empid');
$this->db->join('T_DepartmentDetails as Dep','Dep.DEPCode=emp.Departmentcode');
$this->db->join('T_PurchaseOrder_LineItem req', 'req.PONO= mast.PONO'); $this->db->join('T_PurchaseOrder_LineItem req', 'req.PONO= mast.PONO');
$this->db->join('T_Requestion_Master rmast','rmast.ReqNo=req.ReqNo'); $this->db->join('T_Requestion_Master rmast','rmast.ReqNo=req.ReqNo');
//$this->db->join('T_CostCenter_Budget bud','bud.CostCenterCode = req.CostCenterCode and bud.BudgetType = rmast.ReqType'); //$this->db->join('T_CostCenter_Budget bud','bud.CostCenterCode = req.CostCenterCode and bud.BudgetType = rmast.ReqType');
$this->db->join('T_CostCenter_Master ccm','ccm.CostCenterCode = req.CostCenterCode'); $this->db->join('T_CostCenter_Master ccm','ccm.CostCenterCode = req.CostCenterCode');
$this->db->join('tbl_users tbl', 'rmast.createdby=tbl.userid');
$this->db->join('T_Employee_Details as emp', 'emp.empid=tbl.empid');
$this->db->join('T_DepartmentDetails as Dep','Dep.DEPCode=emp.Departmentcode');
// $this->db->where('mast.Status',PO_AMENDED); // EMERGENGY PO // $this->db->where('mast.Status',PO_AMENDED); // EMERGENGY PO
if($Amendment=='A'){ //A- Approved if($Amendment=='A'){ //A- Approved
$this->db->or_where('mast.Status',PO_CREATED);//PO CREATED $this->db->or_where('mast.Status',PO_CREATED);//PO CREATED