diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php index a0f828cf..ffda295f 100644 --- a/app/Models/Purchaseorder_model.php +++ b/app/Models/Purchaseorder_model.php @@ -1588,9 +1588,9 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per, ->join('t_requestion_master rmast', 'rmast.ReqNo=req.ReqNo') //->join('t_costcenter_budget bud','bud.CostCenterCode = req.CostCenterCode and bud.BudgetType = rmast.ReqType') ->join('t_costcenter_master ccm', 'ccm.CostCenterCode = req.CostCenterCode', 'left') - ->join('tbl_users tbl', 'rmast.createdby=tbl.userid') - ->join('t_employee_details as emp', 'emp.empid=tbl.empid') - ->join('t_departmentdetails as Dep', 'Dep.DEPCode=emp.Departmentcode'); + ->join('tbl_users tbl', 'rmast.createdby=tbl.userid', 'left') + ->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left') + ->join('t_departmentdetails as Dep', 'Dep.DEPCode=emp.Departmentcode', 'left'); // old Status Don't Deleted it. // if ($type == 'APPROVAL') { diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index 432a27f6..dd14e7b8 100644 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -88,7 +88,7 @@ top: 7px; } /* Select2 Height End */ - /* .navbar-custom{ + .navbar-custom{ height: 55px; } .logo-box .logo { @@ -106,13 +106,13 @@ } .topnav .navbar-nav .nav-link{ line-height: 15px; - } */ + } .navbar-custom { background-color: #4f7c97 !important; } - th{ + /* th{ background-color: #ddd !important; - } + } */ .btn.btn-secondary.buttons-html5 , .btn.btn-secondary.buttons-print{ border: 1px solid grey; border-radius: 4px !important; @@ -348,10 +348,10 @@