From 976a77d344d3124ff5bd8445737d0c46f1dad49c Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Tue, 11 Mar 2025 11:39:23 +0530
Subject: [PATCH] changes in purchase module 11-03-2025

---
 app/Views/addasset.php        |  3 +--
 app/Views/expense_list.php    | 17 ++++++++++++++++-
 app/Views/requisitionform.php |  4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/Views/addasset.php b/app/Views/addasset.php
index b9e18ed3..130de5e2 100755
--- a/app/Views/addasset.php
+++ b/app/Views/addasset.php
@@ -47,8 +47,7 @@
 														<select class="form-control required " required id="PONO" required name="PONO">
 															<option value="">Select PO Number</option>
 															<?php
-															echo "////***////";
-															print_r($po);
+															
 															if (!empty($po)) {
 																foreach ($po as $po) {
 
diff --git a/app/Views/expense_list.php b/app/Views/expense_list.php
index 45dd3273..7d9e8694 100755
--- a/app/Views/expense_list.php
+++ b/app/Views/expense_list.php
@@ -432,11 +432,22 @@ dateInput.addEventListener('change', function () {
             $('.modal-title').html('Add Expense');
             $('#transporterfile').val(''); // Clear the file input
             $('#currentFileName').text(''); // Clear the file name display
-            $('#supplierid').val('').trigger('change');
             $('#remarks').val('');
             $('#cost').val('');
             $('#gst').val('');
             $('#total').val('');
+            $('#transporterfile').val(''); // Clear the file input
+            $('#currentFileName').text(''); // Clear the file name display
+            $('#supplierid').val('').trigger('change');
+            $('#item_description').val('');
+            $('#cgst').val('');
+            $('#sgst').val('');
+            $('#igst').val('');
+            $('#total').val('');
+            $('#non_igr_status').val('');
+            $('#bill_no').val('');
+            $('#bill_date').val('');
+
             // $('#status').val('');
             var supplier_list = [<?php echo $supplier_list; ?>];
             $('#supplierid').empty(); // Clear the supplier dropdown
@@ -446,6 +457,9 @@ dateInput.addEventListener('change', function () {
                 $('#supplierid').append('<option value="' + supplier.SupplierID + '">' + supplier.SupplierName + '</option>');
             });
             formActionUrl = '<?php echo base_url() . 'addExpense' ?>'; // Set action URL for adding
+
+            $('#addExpense').attr('href', formActionUrl);
+
          
         });
 
@@ -474,6 +488,7 @@ dateInput.addEventListener('change', function () {
                                 $('#loader').hide();
                                 $('#expenseForm')[0].reset();
                                 $('#file-name-display').text(''); // Clear the file name display
+                                $('#expenseModal').modal('hide');
                                 window.location.reload();
                             } else {
                                 $('#loader').hide();
diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php
index c04d9b09..544497e0 100755
--- a/app/Views/requisitionform.php
+++ b/app/Views/requisitionform.php
@@ -143,7 +143,7 @@ if (!empty($Emp)) {
 												<th class="th">SNo</th>
 												<th class="th">Material Code</th>
 												<th class="th" style="text-align:left !important;">Material Name</th>
-												<th class="th">Material Category</th>
+												<th class="th" style="text-align:left !important;">Material Category</th>
 												<th class="th" style="text-align:left !important;">Uom</th>
 												<th class="th" style="text-align:right !important;">Quantity</th>
 												<th class="th">Action</th>
@@ -683,7 +683,7 @@ if (!empty($Emp)) {
 					<td align="center">${temp}</td>
 					<td align="center">${materialCode}</td>
 					<td align="left">${materialName}</td>
-					<td align="center">${categoryName}</td>
+					<td align="left">${categoryName}</td>
 					<td align="left">${uom}</td>
 					<td align="right">${quantity}</td>
 					<td align="center">