From cbd6dd4a9a5ca576b96e47afcfb485e66685875c Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 7 Mar 2025 11:33:06 +0000
Subject: [PATCH] Tracker issues : ps

---
 app/Views/capitalpurchaseorder.php |  8 ++++----
 app/Views/editCapitalAmendPO.php   |  2 +-
 app/Views/editCapitalPo.php        |  4 ++--
 app/Views/editImportAmendPO.php    |  2 +-
 app/Views/editRevenueAmendPO.php   |  5 +++--
 app/Views/editServiceAmendPO.php   | 16 +++++++++++++++-
 app/Views/editimportpo.php         |  2 +-
 app/Views/importpo.php             | 17 ++++++++++-------
 8 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index d0624eb6..a9d1dedf 100755
--- a/app/Views/capitalpurchaseorder.php
+++ b/app/Views/capitalpurchaseorder.php
@@ -1135,7 +1135,7 @@ if (!empty($INRSYMBOL)) {
 
                     <div class="form-row">
 
-                        <div class="form-group col-md-3"></div>
+                        <div class="form-group col-md-9"></div>
 
                         <div class="form-group col-md-3" id="hideModalExchange">
                             <label> Exchange Rate</label>
@@ -1657,7 +1657,7 @@ if (!empty($INRSYMBOL)) {
 
                                 <div class="form-group col-md-6">
                                     <!-- RMC Including Customers -->
-                                    <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                    <label><?php echo "Net per Uom($INR)"; ?></label>
                                     <?php
                                     $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
                                     echo form_input($data);
@@ -1767,7 +1767,7 @@ if (!empty($INRSYMBOL)) {
                         </div>
 
                         <div class="form-row">
-                            <div class="form-group col-md-3"></div>
+                            <div class="form-group col-md-9"></div>
 
                             <div class="form-group col-md-3" id="hideModalExchangeEdit">
                                 <label> Exchange Rate</label>
@@ -2374,7 +2374,7 @@ if (!empty($INRSYMBOL)) {
 
                                     <div class="form-group col-md-4">
                                         <!-- RMC Including Customers -->
-                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                        <label><?php echo "Net per Uom($INR)"; ?></label>
                                         <div>
                                             <?php
                                             $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index 0b1a2591..7622cad0 100755
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -2326,7 +2326,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                             </div>
                                                             
                                                             <div class="form-group col-md-4 " style="margin-top: -4.8%">
-                                                            <label for="EditNett">Nett per UOM<?php echo "($INR)"; ?></label>
+                                                            <label for="EditNett">Net per Uom<?php echo "($INR)"; ?></label>
                                                                 <?php
                                                                 $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
                                                                 echo form_input($data);
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index fccbc4da..8950b55a 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -2378,7 +2378,7 @@ if (!empty($getlogpodtl)) {
 
                 <div class="form-group col-md-4" style="margin-top: -25px;">
                   <!-- RMC Including Customers -->
-                  <span><?php echo "Nett per UOM($INR)"; ?></span>
+                  <span><?php echo "Net per Uom($INR)"; ?></span>
                   <div class="form-group">
                     <?php
                     $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -3630,7 +3630,7 @@ if (!empty($getlogpodtl)) {
                   </div>
                   <div class="form-group col-md-4" style="margin-top: -25px;">
                     <!-- RMC Including Customers -->
-                    <span><?php echo "Nett per UOM($INR)"; ?></span>
+                    <span><?php echo "Net per Uom($INR)"; ?></span>
                     <div class="form-group">
                       <?php
                       $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php
index 305a4129..89d76ca4 100755
--- a/app/Views/editImportAmendPO.php
+++ b/app/Views/editImportAmendPO.php
@@ -1141,7 +1141,7 @@ if (!empty($RequistionDetails)) {
                                                             </div>
                                                             <div class="form-group col-md-6">
                                                                 <!-- RMC Including Customers -->
-                                                                <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                                                <label><?php echo "Net per Uom($INR)"; ?></label>
                                                                 <div>
                                                                     <?php
                                                                     $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index a8fd8004..d108594b 100755
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -1218,10 +1218,10 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<br>
 							<div class="form-row">
+								<div class="scrollable-table">
 							    <div class="table-responsive" style="padding-bottom: 30px;">
-										<table id="revenueTax" class="table table-bordered table-hover" style="font-size:12px;">
+									<table id="revenueTax" class="table table-bordered table-hover" style="font-size:12px;">
 										<thead>
-
 											<tr>
 												<th style="white-space: nowrap !important;">SNo</th>
 												<th class="text-center" style="white-space: nowrap !important;">Requisition No</th>
@@ -1456,6 +1456,7 @@ if (!empty($INRSYMBOL)) {
 										</tbody>
 									</table>
 								</div>
+								</div>
 							</div>
 							<br>
 							<div class="form-row">
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index 1b7f61d3..3b4a104a 100755
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -649,6 +649,19 @@ foreach ($PaymentTerms as $TER) {
 		});
 	});
 </script>
+<style>
+        /* Container for the scrollable table */
+        .scrollable-table {
+            overflow: auto; /* Enable scrolling */
+            scrollbar-width: none; /* Hide scrollbar in Firefox */
+            -ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
+        }
+
+        /* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
+        .scrollable-table::-webkit-scrollbar {
+            display: none; /* Hide scrollbar */
+        }
+</style>
 <style>
 	#mceu_5{
 		border-width: 0px 0px 0px !important;
@@ -1017,7 +1030,7 @@ foreach ($PaymentTerms as $TER) {
 
 							<br />
 							<div class="form-row">
-								<div class="table-responsive" style="padding-bottom: 30px;">
+								<div class="table-responsive scrollable-table" style="padding-bottom: 30px;">
 									<table id="ServiceTable" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;">
 										<thead>
 											<tr>
@@ -1179,6 +1192,7 @@ foreach ($PaymentTerms as $TER) {
 										</tbody>
 									</table>
 								</div>
+
 							</div>
 
 
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index 87b54b5b..c7043989 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -2959,7 +2959,7 @@ if (!empty($getlogpodtl)) {
                                 </div>
                                 <div class="form-group col-md-6">
                                     <!-- RMC Including Customers -->
-                                    <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                    <label><?php echo "Net per Uom($INR)"; ?></label>
                                     <div>
                                         <?php
                                         $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index f5f1a0b4..59a2a481 100755
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -827,8 +827,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                     <thead>
                                         <tr>
                                             <th style="white-space: nowrap !important;">SNo</th>
-                                            <th style="white-space: nowrap !important; text-align:right !important">Requisition No</th>
-                                            <th style="white-space: nowrap !important;">Item Code</th>
+                                            <th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
+											<th style="white-space: nowrap !important;">Item Code</th>
                                             <th style="white-space: nowrap !important;">Item Description</th>
                                             <th style="white-space: nowrap !important;">Line Item Specs</th>
                                             <th style="white-space: nowrap !important; text-align:right !important">Quantity</th>
@@ -1535,7 +1535,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
                                     <div class="form-group col-md-6">
                                         <!-- RMC Including Customers -->
-                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                        <label><?php echo "Net per Uom($INR)"; ?></label>
                                         <div>
                                             <?php
                                             $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -2106,7 +2106,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
                                     <div class="form-group col-md-6">
                                          
-                                          <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                          <label><?php echo "Net per Uom($INR)"; ?></label>
                                         <div>
                                           
                                             <?php
@@ -3530,7 +3530,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
             var rowHtml = `
     <tr id="${temp}">
         <td style="text-align:left !important">${temp}</td>
-        <td style="text-align:right !important">${Reqnumber}</td>
+        <td style="text-align:center !important">${Reqnumber}</td>
         <td style="text-align:left !important">${materialCode}</td>
         <td style="text-align:left !important">${shorten}</td>
         <td style="text-align:left !important">
@@ -3645,7 +3645,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
             clearTaxField();
             $('#IMPORT').modal('hide');
             setTimeout(() => {
-                alert('Line Item Added SuccesFully..');
+                // alert('Line Item Added SuccesFully..'); tracker id - 1444
+                console.log('Line Item Added SuccesFully..');
             }, 1000);
         }
 
@@ -3924,7 +3925,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
             populateValueMainFormForEditImportTax();
             $('#editimportpomodel').modal('hide');
             setTimeout(() => {
-                alert("Line Item Update SuccesFully..");
+                // alert("Line Item Update SuccesFully.."); tracker id - 1444
+                console.log('Line Item Added SuccesFully..');
+
             }, 1000);
         }
     });