From 47fd42baee848a5b2bac43d01c8464b742ed6a4b Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Tue, 22 Apr 2025 11:48:55 +0530
Subject: [PATCH] stock changes 22-04-2025

---
 app/Config/Routes.php                 |  3 +++
 app/Models/Dashboard_model.php        | 10 +++++-----
 app/Views/Report_pending_purchase.php |  1 +
 app/Views/includes/new_header.php     | 12 ++++++++++--
 app/Views/reportslink.php             |  2 +-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 752cfac5..56ca9f5a 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -544,3 +544,6 @@ $routes->post('updateTrpProductionDetails', 'StockController::updateTrpProductio
 $routes->post('updateAbstractDetails','StockController::updateAbstractDetails');
 
 
+//Reports Module
+
+$routes->get('allReports','Report::allReports');
\ No newline at end of file
diff --git a/app/Models/Dashboard_model.php b/app/Models/Dashboard_model.php
index 82e2cd67..3bfa49d0 100755
--- a/app/Models/Dashboard_model.php
+++ b/app/Models/Dashboard_model.php
@@ -1065,11 +1065,11 @@ pm.Status != 'ST030' and pm.Status != 'ST056'   and pm.Status != 'ST027' ";
 
 
     $sql = "SELECT
-   CASE WHEN MONTH(PODate)>=4 THEN
-          concat(YEAR(PODate), '-',YEAR(PODate)+1)
-   ELSE concat(YEAR(PODate)-1,'-', YEAR(PODate)) END AS financial_year
-   FROM t_purchaseorder_master
-GROUP BY financial_year";
+            CASE WHEN MONTH(PODate)>=4 THEN
+                    concat(YEAR(PODate), '-',YEAR(PODate)+1)
+            ELSE concat(YEAR(PODate)-1,'-', YEAR(PODate)) END AS financial_year
+            FROM t_purchaseorder_master
+            GROUP BY financial_year";
     $query = $this->db->query($sql);
     return $query->getResult();
   }
diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php
index a4c5eafd..b46cc7f0 100755
--- a/app/Views/Report_pending_purchase.php
+++ b/app/Views/Report_pending_purchase.php
@@ -125,6 +125,7 @@
 												</div>
 											</div>
 										</div>
+										<br>
 										<div class="row">
 											<div class="col-2">
 												<label for="from_date">
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index 0ba5b097..672de53f 100755
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -952,10 +952,18 @@
                         <?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-->
                     </div> <!-- end .collapsed-->
diff --git a/app/Views/reportslink.php b/app/Views/reportslink.php
index f2840762..c03055cd 100755
--- a/app/Views/reportslink.php
+++ b/app/Views/reportslink.php
@@ -26,7 +26,7 @@
                                     </div>
                                     <div class="col-md-3">
                                         <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>
                                         <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>