From 0fe5ef39f5d4a1823b77515e469198d0130ad552 Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Fri, 27 Dec 2024 14:38:16 +0530
Subject: [PATCH] merge :gwm

---
 app/Controllers/Expense.php  | 2 +-
 app/Views/attendance.php     | 6 +++---
 app/Views/publicholidays.php | 4 ++--
 app/Views/sales_invoice.php  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/Expense.php b/app/Controllers/Expense.php
index 3d545ab0..0d7101be 100755
--- a/app/Controllers/Expense.php
+++ b/app/Controllers/Expense.php
@@ -53,7 +53,7 @@ class Expense extends BaseController
         // If no last serial number exists, start with 00001
         $lastNumber = $lastSerial ? (int)explode('/', $lastSerial)[1] : 0;
         $newNumber = str_pad($lastNumber + 1, 5, '0', STR_PAD_LEFT);
-        return "$financialYear/$newNumber";
+        return "NonIGR/$financialYear/$newNumber";
     }
 
     public function addExpense()
diff --git a/app/Views/attendance.php b/app/Views/attendance.php
index df2d39e5..d8e36cce 100755
--- a/app/Views/attendance.php
+++ b/app/Views/attendance.php
@@ -407,7 +407,7 @@ $currentday = date('d');
                                                         $WH = 'WH' . $col;
                                                         $OT = 'OT' . $col;
 
-                                                    ?>
+                                                     ?>
                                                         <td <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> "
                                                             <?php } else if ($flag == 1) { ?> title="sunday" <?php } ?>
                                                             class="celda_normal"
@@ -422,7 +422,7 @@ $currentday = date('d');
                                                             <?php if (!empty($a->$WH)) {
                                                                 echo $a->$WH;
                                                             } else {
-                                                                echo '0';
+                                                                echo '';
                                                             } ?></td>
                                                         <td <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> "
                                                             <?php } else if ($flag == 1) { ?> title="sunday" <?php } ?>
@@ -438,7 +438,7 @@ $currentday = date('d');
                                                             <?php if (!empty($a->$OT)) {
                                                                 echo $a->$OT;
                                                             } else {
-                                                                echo '0';
+                                                                echo '';
                                                             } ?></td>
 
                                                     <?php $flag = 0;
diff --git a/app/Views/publicholidays.php b/app/Views/publicholidays.php
index ff8fd0ca..7d001121 100755
--- a/app/Views/publicholidays.php
+++ b/app/Views/publicholidays.php
@@ -181,8 +181,8 @@
 <script>
   $(document).ready(function() {
     $("#hdate").datepicker({
-        format: 'dd-mm-yyyy', // Correct format for Bootstrap Datepicker
-        startDate: new Date(), // Replace `d` with `new Date()` if `d` is not defined
+        format: 'dd-mm-yyyy', 
+        // startDate: new Date(), 
         autoclose: true,
         todayHighlight: true,
         clearBtn: true 
diff --git a/app/Views/sales_invoice.php b/app/Views/sales_invoice.php
index eb9f536e..51408abd 100755
--- a/app/Views/sales_invoice.php
+++ b/app/Views/sales_invoice.php
@@ -286,7 +286,7 @@
                                                         <a href="#" 
                                                         class="editable-field" 
                                                         data-invoice-id="<?php echo $invoice->invoice_id; ?>">
-                                                        <?php echo !empty($invoice->received_qty) ? $invoice->received_qty : "Click to Edit"; ?>
+                                                        <?php echo !empty($invoice->received_qty) ? $invoice->received_qty : "0"; ?>
                                                         </a>
                                                         <div class="edit-container" style="display:none;">
                                                             <input type="text" class="edit-input-field" />