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

stock changes 22-04-2025

Browse Source
This commit is contained in:
vadivelJ96 2025-04-22 11:48:55 +05:30
parent ea5f7b3680
commit 47fd42baee
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Config/Routes.php
View File

@ -544,3 +544,6 @@ $routes->post('updateTrpProductionDetails', 'StockController::updateTrpProductio
$routes->post('updateAbstractDetails','StockController::updateAbstractDetails'); $routes->post('updateAbstractDetails','StockController::updateAbstractDetails');
//Reports Module
$routes->get('allReports','Report::allReports');

10
app/Models/Dashboard_model.php
View File

@ -1065,11 +1065,11 @@ pm.Status != 'ST030' and pm.Status != 'ST056' and pm.Status != 'ST027' ";
$sql = "SELECT $sql = "SELECT
CASE WHEN MONTH(PODate)>=4 THEN CASE WHEN MONTH(PODate)>=4 THEN
concat(YEAR(PODate), '-',YEAR(PODate)+1) concat(YEAR(PODate), '-',YEAR(PODate)+1)
ELSE concat(YEAR(PODate)-1,'-', YEAR(PODate)) END AS financial_year ELSE concat(YEAR(PODate)-1,'-', YEAR(PODate)) END AS financial_year
FROM t_purchaseorder_master FROM t_purchaseorder_master
GROUP BY financial_year"; GROUP BY financial_year";
$query = $this->db->query($sql); $query = $this->db->query($sql);
return $query->getResult(); return $query->getResult();
} }

1
app/Views/Report_pending_purchase.php
View File

@ -125,6 +125,7 @@
</div> </div>
</div> </div>
</div> </div>
<br>
<div class="row"> <div class="row">
<div class="col-2"> <div class="col-2">
<label for="from_date"> <label for="from_date">

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

@ -952,10 +952,18 @@
<?php }?> <?php }?>
<!-- report generation -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-report-generation" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-file"></i> Reports
</a>
<div class="dropdown-menu" aria-labelledby="topnav-report-generation">
<a class="dropdown-item" href="<?= base_url('reports') ?>">All Reports</a>
</div>
</li>
</ul> <!-- end navbar--> </ul> <!-- end navbar-->
</div> <!-- end .collapsed--> </div> <!-- end .collapsed-->

2
app/Views/reportslink.php
View File

@ -26,7 +26,7 @@
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<h4><span class="fa fa-shopping-cart">&nbsp; Purchase </span></h4> <h4><span class="fa fa-shopping-cart">&nbsp; Purchase </span></h4>
<p class="uk-text-meta uk-margin-remove">Purchase</p> <a href="<?php echo base_url(); ?>Report_purchase" target="_blank"><p class="uk-text uk-margin-remove">Purchase</p></a>
<p class="uk-text-meta uk-margin-remove">Year Wise</p> <p class="uk-text-meta uk-margin-remove">Year Wise</p>
<a href="<?php echo base_url(); ?>Report_pending_purchase" target="_blank"><p class="uk-text uk-margin-remove">Pending</p></a> <a href="<?php echo base_url(); ?>Report_pending_purchase" target="_blank"><p class="uk-text uk-margin-remove">Pending</p></a>
<p class="uk-text-meta uk-margin-remove">Purchase Supplier - Wise</p> <p class="uk-text-meta uk-margin-remove">Purchase Supplier - Wise</p>