RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code merge : GWM

Browse Source
This commit is contained in:
bitbucket 2024-08-31 11:22:42 +05:30
parent fffc1f0b26
commit 8a18f5d197
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Purchaseorder_model.php
View File

@ -1588,9 +1588,9 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
->join('t_requestion_master rmast', 'rmast.ReqNo=req.ReqNo') ->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_budget bud','bud.CostCenterCode = req.CostCenterCode and bud.BudgetType = rmast.ReqType')
->join('t_costcenter_master ccm', 'ccm.CostCenterCode = req.CostCenterCode', 'left') ->join('t_costcenter_master ccm', 'ccm.CostCenterCode = req.CostCenterCode', 'left')
->join('tbl_users tbl', 'rmast.createdby=tbl.userid') ->join('tbl_users tbl', 'rmast.createdby=tbl.userid', 'left')
->join('t_employee_details as emp', 'emp.empid=tbl.empid') ->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left')
->join('t_departmentdetails as Dep', 'Dep.DEPCode=emp.Departmentcode'); ->join('t_departmentdetails as Dep', 'Dep.DEPCode=emp.Departmentcode', 'left');
// old Status Don't Deleted it. // old Status Don't Deleted it.
// if ($type == 'APPROVAL') { // if ($type == 'APPROVAL') {

12
app/Views/includes/new_header.php
View File

@ -88,7 +88,7 @@
top: 7px; top: 7px;
} }
/* Select2 Height End */ /* Select2 Height End */
/* .navbar-custom{ .navbar-custom{
height: 55px; height: 55px;
} }
.logo-box .logo { .logo-box .logo {
@ -106,13 +106,13 @@
} }
.topnav .navbar-nav .nav-link{ .topnav .navbar-nav .nav-link{
line-height: 15px; line-height: 15px;
} */ }
.navbar-custom { .navbar-custom {
background-color: #4f7c97 !important; background-color: #4f7c97 !important;
} }
th{ /* th{
background-color: #ddd !important; background-color: #ddd !important;
} } */
.btn.btn-secondary.buttons-html5 , .btn.btn-secondary.buttons-print{ .btn.btn-secondary.buttons-html5 , .btn.btn-secondary.buttons-print{
border: 1px solid grey; border: 1px solid grey;
border-radius: 4px !important; border-radius: 4px !important;
@ -348,10 +348,10 @@
<a href="index.html" class="logo logo-light text-center"> <a href="index.html" class="logo logo-light text-center">
<span class="logo-sm"> <span class="logo-sm">
<img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="24"> <img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="30">
</span> </span>
<span class="logo-lg"> <span class="logo-lg">
<img src="<?php echo base_url(); ?>public/new_assets/images/RESICO (2).png" alt="" height="20"> <img src="<?php echo base_url(); ?>public/new_assets/images/RESICO (2).png" alt="" height="30">
</span> </span>
</a> </a>
</div> </div>