diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php
index e4e5fdcb..4e7fb046 100755
--- a/app/Controllers/Emergencypurchaseorder.php
+++ b/app/Controllers/Emergencypurchaseorder.php
@@ -1276,7 +1276,7 @@ class Emergencypurchaseorder extends BaseController
                 }
             }
         }
-        echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO;
+        echo "Purchase Order Created Successfully! \n PO Number Is: " . $PONO;
     }
     //This used to Edit the Revenue Purchase Order
     function EditRevenuePurchaseOrder()
@@ -1447,7 +1447,7 @@ class Emergencypurchaseorder extends BaseController
             }
         }
 
-        echo 'Purchase Order Updated Successfully! PO Number Is: ' . $PONO;
+        echo "Purchase Order Updated Successfully! \n PO Number Is: " . $PONO;
     }
     
 
diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php
index baea8ddd..0b69cc35 100755
--- a/app/Controllers/Purchaseorder.php
+++ b/app/Controllers/Purchaseorder.php
@@ -1259,11 +1259,11 @@ class Purchaseorder extends BaseController
           }
         }
       }
-      $message = 'Revenue Purchase Order Created Successfully! PO Number Is: ' . $PONO;
+      $message = "Revenue Purchase Order Created Successfully!\nPO Number Is: " . $PONO;
       if($POStatus == 'ST014'){
-      $message = 'Revenue Purchase Order Saved as Draft! PO Number Is: ' . $PONO;
+      $message = "Revenue Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
       } else if($POStatus == 'ST026'){
-      $message = 'Revenue Purchase Order Approved Successfully! PO Number Is: ' . $PONO;
+      $message = "Revenue Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
       } 
       echo $message;
     } catch (\Exception $e) {
@@ -1596,11 +1596,11 @@ class Purchaseorder extends BaseController
       }
     }
 
-    $message = 'Revenue Purchase Order Updated Successfully! PO Number Is: ' . $PONO;
+    $message = "Revenue Purchase Order Updated Successfully!\nPO Number Is: " . $PONO;
     if($POStatus == 'ST014'){
-      $message = 'Revenue Purchase Order Saved as Draft! PO Number Is: ' . $PONO;
+      $message = "Revenue Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
     } else if($POStatus == 'ST026'){
-      $message = 'Revenue Purchase Order Approved Successfully! PO Number Is: ' . $PONO;
+      $message = "Revenue Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
     } 
       echo $message;
   }
@@ -2163,11 +2163,11 @@ class Purchaseorder extends BaseController
         }
       }
 
-    $message = 'Import Purchase Order Created Successfully! PO Number Is: ' . $PONO;
+    $message = "Import Purchase Order Created Successfully!\nPO Number Is: " . $PONO;
     if($POStatus == 'ST014'){
-      $message = 'Import Purchase Order Saved as Draft! PO Number Is: ' . $PONO;
+      $message = "Import Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
     } else if($POStatus == 'ST026'){
-      $message = 'Import Purchase Order Approved Successfully! PO Number Is: ' . $PONO;
+      $message = "Import Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
     } 
       echo $message;
 
@@ -2552,11 +2552,11 @@ class Purchaseorder extends BaseController
     }
 
 
-    $message = 'Import Purchase Order Updated Successfully! PO Number Is: ' . $PONO;
+    $message = "Import Purchase Order Updated Successfully!\nPO Number Is: " . $PONO;
     if($POStatus == 'ST014'){
-      $message = 'Import Purchase Order Saved as Draft! PO Number Is: ' . $PONO;
+      $message = "Import Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
     } else if($POStatus == 'ST026'){
-      $message = 'Import Purchase Order Approved Successfully! PO Number Is: ' . $PONO;
+      $message = "Import Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
     } 
     echo $message;
   }
@@ -2937,11 +2937,11 @@ class Purchaseorder extends BaseController
         }
       }
 
-      $message = 'Capital Purchase Order Created Successfully! PO Number Is: ' . $PONO;  
+      $message = "Capital Purchase Order Created Successfully!\nPO Number Is: " . $PONO;  
       if($POStatus == 'ST014'){
-        $message = 'Capital Purchase Order Saved as Draft! PO Number Is: ' . $PONO;
+        $message = "Capital Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
       } else if($POStatus == 'ST026'){
-        $message = 'Capital Purchase Order Approved Successfully! PO Number Is: ' . $PONO;
+        $message = "Capital Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
       } 
       echo $message;
     } catch (\Exception $e) {
@@ -3373,11 +3373,11 @@ class Purchaseorder extends BaseController
         }
       }
     }
-    $message = 'Capital Purchase Order Updated Successfully! PO Number Is: ' . $PONO;  
+    $message = "Capital Purchase Order Updated Successfully!\nPO Number Is: " . $PONO;  
     if($POStatus == 'ST014'){
-      $message = 'Capital Purchase Order Saved as Draft! PO Number Is: ' . $PONO;
+      $message = "Capital Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
     } else if($POStatus == 'ST026'){
-      $message = 'Capital Purchase Order Approved Successfully! PO Number Is: ' . $PONO;
+      $message = "Capital Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
     } 
     echo $message;
 
@@ -4563,7 +4563,7 @@ class Purchaseorder extends BaseController
     $materialCode = $this->request->getPost('materialCode');
 
 
-    $data = $this->PurchaseOrderLineItemModel->select('t_purchaseorder_lineitem.PONO,t_purchaseorder_master.TotalOrderValue,t_purchaseorder_master.CreatedDate,t_purchaseorder_master.POType,t_purchaseorder_master.CapitalRange,t_supplierdetailsn.SupplierName')
+    $data = $this->PurchaseOrderLineItemModel->select('t_purchaseorder_lineitem.PONO,t_purchaseorder_master.TotalOrderValue,t_purchaseorder_master.CreatedDate,t_purchaseorder_master.POType,t_purchaseorder_master.CapitalRange,t_supplierdetailsn.SupplierName,t_purchaseorder_master.POType as ReqType')
                  ->where('t_purchaseorder_lineitem.MaterialCode',$materialCode)
                  ->join('t_purchaseorder_master', 't_purchaseorder_lineitem.PONO = t_purchaseorder_master.PONO', 'left')
                  ->join('t_supplierdetailsn', 't_purchaseorder_master.SupplierID = t_supplierdetailsn.SupplierID', 'left')
diff --git a/app/Controllers/Servicepurchaseorder.php b/app/Controllers/Servicepurchaseorder.php
index ab42ce4b..192e58b2 100755
--- a/app/Controllers/Servicepurchaseorder.php
+++ b/app/Controllers/Servicepurchaseorder.php
@@ -342,12 +342,12 @@ class Servicepurchaseorder extends BaseController
 				}
 			}
 		}
-		$message = 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO;
+		$message = "Service Purchase Order Created Successfully!\nPO Number Is: " . $PONO;
 
 		if($POStatus == 'ST014'){
-		$message = 'Service Purchase Order Saved as Draft! PO Number Is: ' . $PONO;
+		$message = "Service Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
 		} else if($POStatus == 'ST026'){
-		$message = 'Service Purchase Order Approved Successfully! PO Number Is: ' . $PONO;
+		$message = "Service Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
 		} 
 		echo $message;
 		
@@ -614,13 +614,13 @@ class Servicepurchaseorder extends BaseController
 			}
 			/*--------- Lineitem Section starts ---------------------*/
 		}
-		$message = 'Service Purchase Order Updated Successfully! PO Number Is: ' . $PONO;
+		$message = "Service Purchase Order Updated Successfully!\nPO Number Is: " . $PONO;
 		if($POStatus == 'ST014'){
-		$message = 'Service Purchase Order Saved as Draft! PO Number Is: ' . $PONO;
+		$message = "Service Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
 		} else if($POStatus == 'ST015'){
-		$message = 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO;
+		$message = "Service Purchase Order Created Successfully!\nPO Number Is: " . $PONO;
 		} else if($POStatus == 'ST026'){
-		$message = 'Service Purchase Order Approved Successfully! PO Number Is: ' . $PONO;
+		$message = "Service Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
 		} 
 		echo $message;
 	}
diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index 749509f5..df67aeac 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -52,6 +52,28 @@
 	.cancel-btn:hover {
 		background-color: #f5c6cb;
 	}
+	.btn-soft-primary {
+		color: white;
+		background-color: rgb(42, 206, 150);
+		border-color: rgb(42, 206, 150);
+	}
+
+	.btn-soft-primary:hover {
+		background-color: rgb(32, 176, 130); /*  Slightly darker shade for hover */
+		border-color: rgb(32, 176, 130);
+	}
+	
+        /* 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>
 <script>
 	$(document).ready(function() {
@@ -1623,7 +1645,7 @@ if (!empty($getlogpodtl)) {
 												<input type="file" name="POFile" id="POFile">
 											</div>
 											<?php if ($PrePOFile) { ?>
-											<div class="col-md-12">
+											<div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
 												<label for="deletePreviousPurchaseOrderFile"><a title="Previous Upload PO File"
 													href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previous Upload - </span><small><?= $PrePOFile; ?></small></a></label>
 												&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1668,21 +1690,26 @@ if (!empty($getlogpodtl)) {
 											</div>
 
 											<div class="col-md-7 text-right">
-											
-													<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) {  ?>
-														<a class="btn btn-secondary" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
-														<?php if ($PONOStatus == PO_DRAFT) { ?>
-															<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
-														<?php } ?>
-														<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-														<a class="btn btn-success Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-													<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
-														<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
-														<a class="btn btn-success Save" ID="Submit" onclick="Save(3)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-													<?php } else { ?>
-														<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
-														<!-- <a class="btn btn-success Save" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a> -->
-													<?php } ?>
+													<?php if ($PONOStatus == PO_DRAFT) {  ?>
+                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                    <?php } else if ($PONOStatus == PO_CREATED) {  ?>
+                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                    <?php } else if ($PONOStatus == SPECIAL_PO) {  ?>
+                                                            <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
+                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+													<?php } else if($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+															<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                    <?php } else { ?>
+                                                            <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
+                                                    <?php } ?>
+                                                    <!-- $PONOStatus == REQITEM_Emergency_PO_CREATED -->
 											</div>
 										</div>
 									</div>
@@ -3864,4 +3891,5 @@ if (!empty($getlogpodtl)) {
 
 		}
 	});
+	function Reset() { location.reload(); }
 </script>
\ No newline at end of file
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 574d1695..b656caef 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -149,6 +149,28 @@ if (!empty($INRSYMBOL)) {
 	.cancel-btn:hover {
 		background-color: #f5c6cb;
 	}
+
+    .btn-soft-primary {
+		color: white;
+		background-color: rgb(42, 206, 150);
+		border-color: rgb(42, 206, 150);
+	}
+
+	.btn-soft-primary:hover {
+		background-color: rgb(32, 176, 130); /*  Slightly darker shade for hover */
+		border-color: rgb(32, 176, 130);
+	}
+    /* 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>
 <script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
 <script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
@@ -6938,7 +6960,8 @@ if (!empty($INRSYMBOL)) {
         var isChecked = $('#IsOpenOrder').is(':checked');
         isChecked ? $('#ServiceQuantity').val(0).prop('readonly', true).prop('required', false) : $('#ServiceQuantity').val('').prop('readonly', false).prop('required', true);
 
-        $('#ServiceMaterialCode').val("0");
+        // $('#ServiceMaterialCode').val("0");
+        $('#ServiceMaterialCode').val("").select2();
         $("#ServiceDescription").val('');
         $('#ServiceUOM').val('');
         $("#ServiceRate").val('');
@@ -7002,6 +7025,7 @@ if (!empty($INRSYMBOL)) {
             }
 
             $("#EditMaterialCode").empty();
+            // $('#EditMaterialCode').val("").select2();
             $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
 
             if (typeof materialData !== 'undefined' && materialData !== null && materialData !== '') {
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index d68b4185..d9eff2ad 100755
--- a/app/Views/capitalpurchaseorder.php
+++ b/app/Views/capitalpurchaseorder.php
@@ -52,6 +52,18 @@
     .cancel-btn:hover {
         background-color: #f5c6cb;
     }
+
+        /* 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>
 <script>
     $(document).ready(function() {
@@ -1002,8 +1014,7 @@ if (!empty($INRSYMBOL)) {
 									<div class="col-md-12">
 										<div class="row">
 											<div class="col-md-12 text-right">
-												<!-- <a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a> -->
-                                                <a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
+                                                <a class="btn btn-danger Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
                                                 <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
                                                 <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
 											</div>
@@ -1137,19 +1148,6 @@ if (!empty($INRSYMBOL)) {
 
                         </div><!-- /. first -->
 
-                        <div class="form-row">
-
-                            <div class="form-group col-md-9"></div>
-
-                            <div class="form-group col-md-3" id="hideModalExchange">
-                                <label> Exchange Rate</label>
-                                <?php
-                                $data = array('name' => 'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
-                                echo form_input($data);
-                                ?>
-                            </div>
-
-                        </div><!-- /. 2nd -->
 
                         <div class="form-row" style="padding: 0px;">
                             <div class="form-group col-md-3">
@@ -1192,8 +1190,14 @@ if (!empty($INRSYMBOL)) {
 
 
                         <div class="form-row">
-
-                            <div class="form-group col-md-3"></div>
+                            <div class="form-group col-md-3" id="DummyDiv"></div>
+                            <div class="form-group col-md-3" id="hideModalExchange">
+                                <label> Exchange Rate</label>
+                                <?php
+                                $data = array('name' => 'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
                             <div class="form-group col-md-3" style="padding-right: 0px;">
                                 <label id="RateIn">Rate(INR /UOM)</label><span class="text-danger">*</span>
                                 <?php
@@ -1608,7 +1612,7 @@ if (!empty($INRSYMBOL)) {
 
 
                                     <br>
-                                    <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+                                    <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
                                     <hr>
                                     <br>
 
@@ -1746,21 +1750,6 @@ if (!empty($INRSYMBOL)) {
                             </div><!-- form-col-3 -->
                         </div><!--/.1st-->
 
-                        <div class="form-row">
-                            <div class="form-group col-md-9"></div>
-
-                            <div class="form-group col-md-3" id="hideModalExchangeEdit">
-                                <label> Exchange Rate</label>
-                                <div>
-                                    <?php
-                                    $data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                            </div><!-- form-col-3 -->
-
-                        </div><!--/.2nd -->
-
                         <div class="form-row" style="padding:0px;">
                             <div class="form-group col-md-3">
                                 <label>Item Code<span class="text-danger">*</span></label>
@@ -1801,7 +1790,17 @@ if (!empty($INRSYMBOL)) {
                         </div><!--/.3rd-->
 
                         <div class="form-row">
-                            <div class="form-group col-md-3"></div>
+                            <div class="form-group col-md-3" id="DummyEditDiv"></div>
+                            <div class="form-group col-md-3" id="hideModalExchangeEdit">
+                                <label> Exchange Rate</label>
+                                <div>
+                                    <?php
+                                    $data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal',  'class' => 'form-control num', 'readonly' => 'true');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div><!-- form-col-3 -->
+
                             <div class="form-group col-md-3" style="padding-right: 0px;">
                                 <label id="EditRateIn">Rate (In INR/UOM)</label><span class="text-danger">*</span>
                                 <div>
@@ -2272,7 +2271,7 @@ if (!empty($INRSYMBOL)) {
                                     </div>
                                     <!--End of Adding of freight in edit model -->
                                     <br>
-                                    <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+                                    <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
                                     <hr>
                                     <br>
                                     <div class="form-row">
@@ -5287,6 +5286,8 @@ if (!empty($INRSYMBOL)) {
             $('#EDITCAPdiv').hide();
             $('#datedomestic').hide();
             $('#dispatchinternational').show();
+            $('#DummyDiv').hide();
+            $('#DummyEditDiv').hide();
 
 
 
@@ -5305,6 +5306,8 @@ if (!empty($INRSYMBOL)) {
             $('#currencytype').val('');
             $('#hideModalExchange').hide();
             $('#hideModalExchangeEdit').hide();
+            $('#DummyDiv').show();
+            $('#DummyEditDiv').show();
             $('#ExchangeRtModal').val('1');
             $('#HideImportTaxTotal').hide();
             $('#ModalImportTaxHide').hide();
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index c7086cad..fb7a822a 100755
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -51,6 +51,30 @@
 	.cancel-btn:hover {
 		background-color: #f5c6cb;
 	}
+
+    .btn-soft-primary {
+		color: white;
+		background-color: rgb(42, 206, 150);
+		border-color: rgb(42, 206, 150);
+	}
+
+	.btn-soft-primary:hover {
+		background-color: rgb(32, 176, 130); /*  Slightly darker shade for hover */
+		border-color: rgb(32, 176, 130);
+	}
+
+    
+        /* 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>
 <?php
 $AvlCapitalBudAmt = isset($AvlCapitalBudAmt) ? (int) $AvlCapitalBudAmt : 0;
@@ -385,6 +409,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
             document.getElementById('currencyTypeDiv').style.display = 'none';
             //document.getElementById('ExchangeRateModalDiv').style.display = 'none';
             document.getElementById('ExchangeRateModalEditDiv').style.display = 'none';
+            document.getElementById('DummyEditDiv').style.display = 'block';
             document.getElementById('HideImportTaxTotal').style.display = 'none';
             // document.getElementById('ModalImportTaxHide').style.display = 'none';
             document.getElementById('EditModalImportTaxHide').style.display = 'none';
@@ -408,6 +433,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
             document.getElementById('currencyTypeDiv').style.display = 'block';
             //document.getElementById('ExchangeRateModalDiv').style.display = 'block';
             document.getElementById('ExchangeRateModalEditDiv').style.display = 'block';
+            document.getElementById('DummyEditDiv').style.display = 'none';
             //document.getElementById('ExchangeRateModalViewDiv').style.display = 'block';
             capitalType = 'International';
             document.getElementById('currencyTypeDiv').style.display = 'block';
@@ -1731,12 +1757,9 @@ if (!empty($POItem) && $CapitalRange == '1') {
 											</div>
 
 											<div class="col-md-7 text-right">
-                                                <input type="button" class="btn btn-secondary" value="Cancel"
-                                                    onClick="window.location ='amendmentpurchaseorder';">
-                                                <a class="btn btn-success Save"  onclick="Save(0)">&nbsp;&nbsp;<span
-                                                    class="bold">Save as Draft</span></a>
-                                                <a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
-                                                    class="bold">Approve</span></a>
+                                                <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                <a class="btn btn-success"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
 								            </div>
 								        </div>
 
@@ -1864,16 +1887,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                                                 </div>
 
-                                                <div class="form-row">
-                                                    <div class="form-group col-md-9"></div>
-                                                    <div class="form-group col-md-3" id="ExchangeRateModalEditDiv" style="display:none;">
-                                                        <label> Exchange Rate</label>
-                                                        <?php
-                                                        $data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
-                                                        echo form_input($data);
-                                                        ?>
-                                                    </div>
-                                                </div>
+
 
                                                 <div class="form-row">
                                                     <div class="form-group col-md-3">
@@ -1910,7 +1924,15 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                 </div>
 
                                                 <div class="form-row">
-                                                    <div class="form-group col-md-3"></div>
+                                                
+                                                    <div class="form-group col-md-3" id="DummyEditDiv"></div>
+                                                    <div class="form-group col-md-3" id="ExchangeRateModalEditDiv">
+                                                        <label> Exchange Rate</label>
+                                                        <?php
+                                                        $data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
+                                                        echo form_input($data);
+                                                        ?>
+                                                    </div>
                                                     <div class="form-group col-md-3" style="padding-right: 0px;">
                                                         <label id="EditRateIn">Rate(in INR/UOM)</label>
                                                         <?php
@@ -2331,7 +2353,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                                 <!--End of Adding of freight in edit model -->
 
                                                                     <br>
-                                                                    <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+                                                                    <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
                                                                     <hr>
                                                                     <br>
                                                             
@@ -5216,4 +5238,5 @@ Calculate Landing charge
             $('#EditNett').val((basicnett).toFixed(2));
         }
     }
+    function Reset() { location.reload(); }
 </script>
\ No newline at end of file
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index ce8e19ec..ba8ab4c0 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -52,6 +52,30 @@
   .cancel-btn:hover {
     background-color: #f5c6cb;
   }
+
+  .btn-soft-primary {
+    color: white;
+    background-color: rgb(42, 206, 150);
+    border-color: rgb(42, 206, 150);
+  }
+
+  .btn-soft-primary:hover {
+    background-color: rgb(32, 176, 130);
+    /*  Slightly darker shade for hover */
+    border-color: rgb(32, 176, 130);
+  }
+  
+        /* 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>
 <script>
   $(document).ready(function() {
@@ -399,44 +423,69 @@ if (!empty($getlogpodtl)) {
 
   var capitalType = '';
   window.onload = function() {
-    $('#PoTypeOptions').attr("style", "pointer-events: none;");
+  //   $('#PoTypeOptions').attr("style", "pointer-events: none;");
     var CapRan = '<?php echo $CapitalRange; ?>';
     if (CapRan == '1') {
 
-      document.getElementById('FromOnline').style.display = 'none';
-      document.getElementById('ExchangeRateOnDiv').style.display = 'none';
-      document.getElementById('ExchangeRateDiv').style.display = 'none';
-      document.getElementById('currencyTypeDiv').style.display = 'none';
-      document.getElementById('ExchangeRateModalDiv').style.display = 'none';
-      document.getElementById('ExchangeRateModalEditDiv').style.display = 'none';
-      document.getElementById('HideImportTaxTotal').style.display = 'none';
-      document.getElementById('ModalImportTaxHide').style.display = 'none';
-      document.getElementById('EditModalImportTaxHide').style.display = 'none';
-      document.getElementById('ExchangeRateModalViewDiv').style.display = 'none';
-      document.getElementById('ViewModalImportTaxHide').style.display = 'none';
-      document.getElementById('PlaceOforigindiv').style.display = 'none';
-      document.getElementById('dispatchinternational').style.display = 'none';
-      document.getElementById('datedomestic').style.display = 'block';
+  //     document.getElementById('FromOnline').style.display = 'none';
+  //     document.getElementById('ExchangeRateOnDiv').style.display = 'none';
+  //     document.getElementById('ExchangeRateDiv').style.display = 'none';
+  //     document.getElementById('currencyTypeDiv').style.display = 'none';
+  //     document.getElementById('ExchangeRateModalDiv').style.display = 'none';
+  //     document.getElementById('ExchangeRateModalEditDiv').style.display = 'none';
+  //     document.getElementById('ExchangeRateModalViewDiv').style.display = 'none';
+  //     document.getElementById('HideImportTaxTotal').style.display = 'none';
+  //     document.getElementById('ModalImportTaxHide').style.display = 'none';
+  //     document.getElementById('EditModalImportTaxHide').style.display = 'none';
+  //     document.getElementById('ViewModalImportTaxHide').style.display = 'none';
+  //     document.getElementById('PlaceOforigindiv').style.display = 'none';
+  //     document.getElementById('dispatchinternational').style.display = 'none';
+  //     document.getElementById('datedomestic').style.display = 'block';
 
+  //     document.getElementById('DummyDiv').style.display = 'block';
+  //     document.getElementById('DummyEditDiv').style.display = 'block';
+  //     document.getElementById('DummyViewDiv').style.display = 'block';
 
       capitalType = 'Domestic';
 
     } else {
-      document.getElementById('FromOnline').style.display = 'block';
-      document.getElementById('ExchangeRateOnDiv').style.display = 'block';
-      document.getElementById('ExchangeRateDiv').style.display = 'block';
-      document.getElementById('currencyTypeDiv').style.display = 'block';
-      document.getElementById('ExchangeRateModalDiv').style.display = 'block';
-      document.getElementById('ExchangeRateModalEditDiv').style.display = 'block';
-      document.getElementById('ExchangeRateModalViewDiv').style.display = 'block';
+  //     document.getElementById('FromOnline').style.display = 'block';
+  //     document.getElementById('ExchangeRateOnDiv').style.display = 'block';
+  //     document.getElementById('ExchangeRateDiv').style.display = 'block';
+  //     document.getElementById('currencyTypeDiv').style.display = 'block';
+  //     document.getElementById('ExchangeRateModalDiv').style.display = 'block';
+  //     document.getElementById('ExchangeRateModalEditDiv').style.display = 'block';
+  //     document.getElementById('ExchangeRateModalViewDiv').style.display = 'block';
       capitalType = 'International';
-      document.getElementById('currencyTypeDiv').style.display = 'block';
-      document.getElementById('ViewModalImportTaxHide').style.display = 'block';
-      document.getElementById('dispatchinternational').style.display = 'block';
-      document.getElementById('datedomestic').style.display = 'none';
+  //     document.getElementById('currencyTypeDiv').style.display = 'block';
+  //     document.getElementById('ViewModalImportTaxHide').style.display = 'block';
+  //     document.getElementById('dispatchinternational').style.display = 'block';
+  //     document.getElementById('datedomestic').style.display = 'none';
+
+  //     document.getElementById('DummyDiv').style.display = 'none';
+  //     document.getElementById('DummyEditDiv').style.display = 'none';
+  //     document.getElementById('DummyViewDiv').style.display = 'none';
 
     }
   }
+  
+
+$(document).ready(function () {
+    var capitalType = '';
+    $('#PoTypeOptions').css("pointer-events", "none");
+    var CapRan = '<?php echo $CapitalRange; ?>';
+
+    if (CapRan == '1') {
+        $('#FromOnline, #ExchangeRateOnDiv, #ExchangeRateDiv, #currencyTypeDiv, #ExchangeRateModalDiv, #ExchangeRateModalEditDiv, #ExchangeRateModalViewDiv, #HideImportTaxTotal, #ModalImportTaxHide, #EditModalImportTaxHide, #ViewModalImportTaxHide, #PlaceOforigindiv, #dispatchinternational').hide();
+        $('#datedomestic, #DummyDiv, #DummyEditDiv, #DummyViewDiv').show();
+        capitalType = 'Domestic';
+    } else {
+        $('#FromOnline, #ExchangeRateOnDiv, #ExchangeRateDiv, #currencyTypeDiv, #ExchangeRateModalDiv, #ExchangeRateModalEditDiv, #ExchangeRateModalViewDiv, #currencyTypeDiv, #ViewModalImportTaxHide, #dispatchinternational').show();
+        $('#datedomestic, #DummyDiv, #DummyEditDiv, #DummyViewDiv').hide();
+        capitalType = 'International';
+    }
+});
+
 </script>
 
 
@@ -523,10 +572,10 @@ if (!empty($getlogpodtl)) {
             <h4><?= $title; ?></h4>
             <a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back"
               value="Back">Back</a>
-          </div>
-        </div>
-      </div>
-      <!-- end page title -->
+          </div><!--/.p a g e-t i t l e -->
+        </div><!--/.c o l-12 -->
+      </div><!--/.r o w 532 -->
+      
       <!-- Form row -->
       <div class="row">
         <div class="col-12">
@@ -1553,10 +1602,9 @@ if (!empty($getlogpodtl)) {
 
                     <label>Select Purchase Order File</label><br>
                     <input type="file" name="POFile" id="POFile">
-                    <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
                   </div>
                   <?php if ($PrePOFile) { ?>
-                    <div class="col-md-12">
+                    <div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
                       <label for="deletePreviousPurchaseOrderFile"><a title="Previous Upload PO File"
                           href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previous Upload - </span><small><?= $PrePOFile; ?></small></a></label>
                       &nbsp;&nbsp;&nbsp;&nbsp;
@@ -1565,6 +1613,7 @@ if (!empty($getlogpodtl)) {
 
                     </div>
                   <?php } ?>
+                  <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
                 </div>
               </div>
               <!-- /. f i l e  c h o o s e n 1550-->
@@ -1608,34 +1657,23 @@ if (!empty($getlogpodtl)) {
                   </div>
 
                   <div class="col-md-7 text-right">
-                    <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { ?>
-                      <a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
-                      <?php if ($PONOStatus == PO_DRAFT) { ?>
-                        <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                      <?php } ?>
-                      <a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                      <a class="btn btn-success Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-                    <?php } else if ($PONOStatus == PO_AMENDED) { ?>
-                      <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
-                      <?php } else {
-                      if ($DEPCode == FINANCE) { ?>
-                        <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
-                        <?php } else if ($DEPCode != FINANCE) {
-                        if (($CapitalRange != 1)) { ?>
-                          <a class="btn btn-success Save" ID="Save" onclick="Save(2)">&nbsp;&nbsp;<span
-                              class="bold">Submit</span></a>
-                          <a class="btn btn-success" ID="OK"
-                            href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
-                        <?php } else { ?>
-                          <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span
-                              class="bold">Submit</span></a>
-                          <a class="btn btn-success" ID="OK"
-                            href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
-                      <?php }
-                      } ?>
-                      <!-- <a class="btn btn-success"  ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> -->
+                    <?php if ($PONOStatus == PO_DRAFT) {  ?>
+                      <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                      <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                      <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                      <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                    <?php } else if ($PONOStatus == PO_CREATED) {  ?>
+                      <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                      <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                      <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                    <?php } else if ($PONOStatus == SPECIAL_PO) {  ?>
+                      <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
+                      <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                    <?php } else { ?>
+                      <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
                     <?php } ?>
 
+
                   </div>
                 </div>
               </div>
@@ -1643,13 +1681,13 @@ if (!empty($getlogpodtl)) {
 
             </div> <!-- end card body 534-->
           </div> <!-- end card 533-->
-        </div><!-- end col 532-->
-      </div><!-- row 531 -->
-    </div> <!-- container 511-->
-  </div> <!-- content 509-->
-</div><!--/.content-page 508-->
-
+        </div><!--/.c o l-12 551-->
+      </div><!--/.r o w 550 -->
+    </div> <!--/.c o n t a i n e r-f l u i d 511-->
+  </div> <!--/.c o n t e n t 509-->
+</div><!--/.c o n t e n t - p a g e 508-->
 
+<!-- Modal for add Packing Calculation -->
 <div id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog"
   aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
   <div class="modal-dialog modal-sm" style="width: 1060px;">
@@ -1675,13 +1713,12 @@ if (!empty($getlogpodtl)) {
         <a class="btn btn-secondary" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
         <a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();">&nbsp;&nbsp;<span
             class="bold">Ok</span></a>
+      </div><!-- /. p a c k a g i n g c a l m o d e l f o o t e r -->
+    </div><!-- /. p a c k a g i n g c a l m o d a l c o n t e n t -->
+  </div><!-- /. p a c k a g i n g c a l m o d a l d i A l o g -->
+</div><!-- /.a d d  p a c k a g i n g c a l m o d a l -->
 
-      </div>
-    </div>
-  </div>
-</div><!-- /.modal -->
-
-<!-- Modal for Packing Calculation -->
+<!-- Modal for edit Packing Calculation -->
 <div id="editpackagingcalmodel" data-backdrop-limit="1" class="modal fade" tabindex="-1" role="dialog"
   aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog modal-lg">
@@ -1710,8 +1747,9 @@ if (!empty($getlogpodtl)) {
       </div>
     </div>
   </div>
-</div><!-- /.modal -->
+</div><!-- /.e d i t  p a c k a g i n g c a l m o d a l -->
 
+<!-- Modal for view Packing Calculation -->
 <div id="viewpackagingcalmodel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
   aria-hidden="true" style="display: none;">
   <div class="modal-dialog modal-lg">
@@ -1741,8 +1779,9 @@ if (!empty($getlogpodtl)) {
       </div>
     </div>
   </div>
-</div><!-- /.modal -->
+</div><!-- /.v i e w  p a c k a g i n g c a l m o d a l -->
 
+<!-- Modal for a d d C A P I T A L -->
 <div id="CAPITAL" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
   style="display: none;">
   <div class="modal-dialog modal-full-width" style="width :1060px !important ;">
@@ -1804,18 +1843,6 @@ if (!empty($getlogpodtl)) {
               </div>
             </div>
           </div>
-          <div id="ExchangeRateModalDiv" style="display:none;">
-            <div class="form-group col-md-9"></div>
-            <div class="form-group col-md-3">
-              <label> Exchange Rate</label>
-              <div class="form-group">
-                <?php
-                $data = array('name' => 'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
-                echo form_input($data);
-                ?>
-              </div>
-            </div>
-          </div>
 
           <div class="form-row">
             <div class="form-group col-md-3">
@@ -1858,7 +1885,15 @@ if (!empty($getlogpodtl)) {
           </div>
 
           <div class="form-row">
-            <div class="form-group col-md-3"></div>
+            <div class="form-group col-md-3" id="DummyDiv"></div>
+            <div class="form-group col-md-3" id="ExchangeRateModalDiv">
+              <label> Exchange Rate</label>
+              <?php
+              $data = array('name' => 'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
+
+              echo form_input($data);
+              ?>
+            </div>
             <div class="form-group col-md-3" style="padding: 0px;">
               <label id="RateIn">Rate(In INR /UOM)</label><span class="text-danger">*</span>
               <div class="form-group">
@@ -2323,7 +2358,7 @@ if (!empty($getlogpodtl)) {
 
 
               <br>
-              <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+              <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
               <hr>
               <br>
               <div class="form-row">
@@ -2419,11 +2454,10 @@ if (!empty($getlogpodtl)) {
       </form>
     </div>
   </div>
-</div><!-- /.modal -->
+</div><!-- /.a d d C A P I T A L -->
 
-<!-- 2nd modal -->
-<div id="EDITCAPITAL" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-  style="display: none;">
+<!-- Modal for e d i t C A P I T A L -->
+<div id="EDITCAPITAL" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
   <div class="modal-dialog modal-full-width" style="width: 1060px !important;">
     <div class="modal-content">
       <div class="modal-header">
@@ -2485,18 +2519,7 @@ if (!empty($getlogpodtl)) {
 
           </div><!-- /.1strow-->
 
-          <div id="ExchangeRateModalEditDiv" style="display:none;">
-            <div class="form-group col-md-9"></div>
-            <div class="form-group col-md-3">
-              <label> Exchange Rate</label>
-              <div class="form-group">
-                <?php
-                $data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal', 'class' => 'form-control', 'readonly' => 'true');
-                echo form_input($data);
-                ?>
-              </div>
-            </div>
-          </div>
+
 
           <div class="form-row" style="padding: 0px;">
             <div class="form-group col-md-3">
@@ -2538,8 +2561,15 @@ if (!empty($getlogpodtl)) {
           </div><!-- /.3rdrow-->
 
           <div class="form-row">
+            <div class="form-group col-md-3" id="DummyEditDiv"></div>
+            <div class="form-group col-md-3" id="ExchangeRateModalEditDiv">
+              <label> Exchange Rate</label>
+              <?php
+              $data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal', 'class' => 'form-control', 'readonly' => 'true');
 
-            <div class="form-group col-md-3"></div>
+              echo form_input($data);
+              ?>
+            </div>
             <div class="form-group col-md-3" style="padding: 0px;">
               <label id="EditRateIn">Rate(in INR/UOM)</label><span class="text-danger">*</span>
               <div class="form-group">
@@ -2977,7 +3007,7 @@ if (!empty($getlogpodtl)) {
               </div><!-- 10throw -->
               <!--End of Adding of freight in edit model -->
               <br>
-              <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+              <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
               <hr>
               <br>
               <div class="form-row">
@@ -3072,9 +3102,9 @@ if (!empty($getlogpodtl)) {
       </form>
     </div><!-- /.content -->
   </div>
-</div><!-- /.modal -->
+</div><!-- /. e d i t C A P I T A L -->
 
-<!-- 3rd modal new view-->
+<!-- Modal for V i e w C A P I T A L -->
 <div id="VIEWCAPITAL" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
   style="display: none;">
   <div class="modal-dialog modal-full-width" style="width :1060px !important ;">
@@ -3086,7 +3116,7 @@ if (!empty($getlogpodtl)) {
       <form>
         <div class="modal-body p-4">
           <div class="form-row">
-            <div class="form-group col-md-3" style="padding:0px">
+            <div class="form-group col-md-3">
               <label>Req No<span class="text-danger">*</span></label>
               <div>
 
@@ -3127,7 +3157,6 @@ if (!empty($getlogpodtl)) {
               </div>
             </div>
           </div>
-          <div id="ExchangeRateModalViewDiv"></div>
 
           <div class="form-row">
             <div class="form-group col-md-3">
@@ -3170,33 +3199,71 @@ if (!empty($getlogpodtl)) {
           </div>
 
           <div class="form-row">
-            <div class="form-group col-md-3"></div>
-            <div class="form-group col-md-3" style="padding: 0px;">
-              <label id="RateIn">Rate(In INR /UOM)</label><span class="text-danger">*</span>
-              <div class="form-group">
+            <div class="form-group col-md-3">
+                <span id="DummyViewDiv"></span>
+                <span id="ExchangeRateModalViewDiv">
+                    <label for="ViewExchangeRtModal">Exchange Rate</label>
+                    <?php
+                    $data = array(
+                        'name' => 'ViewExchangeRtModal',
+                        'value' => set_value('ViewExchangeRtModal'),
+                        'id' => 'ViewExchangeRtModal',
+                        'class' => 'form-control num',
+                        'readonly' => 'true'
+                    );
+                    echo form_input($data);
+                    ?>
+                </span>
+            </div>
+            
+            <div class="form-group col-md-3">
+                <label for="ViewCPRate" id="RateIn">Rate (In INR / UOM)</label><span class="text-danger">*</span>
+                <div class="form-group">
+                    <?php
+                    $data = array(
+                        'name' => 'ViewCPRate',
+                        'value' => set_value('ViewCPRate'),
+                        'id' => 'ViewCPRate',
+                        'class' => 'form-control num',
+                        'onkeypress' => 'return isNumberKey(event);',
+                        'onchange' => 'EditRatechange();',
+                        'readonly' => 'true'
+                    );
+                    echo form_input($data);
+                    ?>
+                </div>
+            </div>
+            
+            <div class="form-group col-md-3">
+                <label for="ViewPer">Per</label>
                 <?php
-                $data = array('name' => 'ViewCPRate', 'value' => set_value('ViewCPRate'), 'id' => 'ViewCPRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                $data = array(
+                    'name' => 'ViewPer',
+                    'value' => set_value('ViewPer'),
+                    'id' => 'ViewPer',
+                    'class' => 'form-control',
+                    'readonly' => 'true'
+                );
                 echo form_input($data);
                 ?>
-              </div>
             </div>
+            
             <div class="form-group col-md-3">
-              <label>Per</label> <?php
-                                  $data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'class' => 'form-control', 'readonly' => 'true');
-                                  echo form_input($data); ?>
+                <label for="ViewCPTotalAmount" id="TotalAmount">Basic Value (INR)</label>
+                <div class="form-group">
+                    <?php
+                    $data = array(
+                        'name' => 'ViewCPTotalAmount',
+                        'value' => set_value('ViewCPTotalAmount'),
+                        'id' => 'ViewCPTotalAmount',
+                        'class' => 'form-control num',
+                        'readonly' => 'true'
+                    );
+                    echo form_input($data);
+                    ?>
+                </div>
             </div>
-            <div class="form-group col-md-3">
-              <label id="TotalAmount">Basic value <?php echo "($INR)" ?></label>
-              <div class="form-group">
-                <?php
-                $data = array('name' => 'ViewCPTotalAmount', 'value' => set_value('ViewCPTotalAmount'), 'id' => 'ViewCPTotalAmount', 'class' => 'form-control num', 'readonly' => 'true');
-                echo form_input($data);
-                ?>
-              </div>
-            </div>
-
-
-          </div>
+        </div>
 
           <div class="form-row" id="VIEWCAPdiv" style="padding:0px;">
             <div class="form-group col-md-3">
@@ -3376,10 +3443,9 @@ if (!empty($getlogpodtl)) {
           </div>
 
           <div class="form-row" style="padding:1%;"></div>
-          <div class="form-row" style="border:1px solid #000;padding:0px;" id="ViewModalImportTaxHide"
-            style="display:none;">
+          <div class="form-row" id="ViewModalImportTaxHide" style="padding:0px !important; margin:0px !important;">
             <br />
-            <div class="form-group col-md-6" style="padding:10px;">
+            <div class="form-group col-md-6">
               <div class="form-row">
                 <div class="form-group col-md-4">
                   Basic Price <?php echo "($INR)" ?>
@@ -3515,7 +3581,7 @@ if (!empty($getlogpodtl)) {
                 </div>
               </div>
             </div><!--/. f o r m - g r o u p  c o l - m d -6-->
-            <div class="form-group col-md-6" style="padding:10px;">
+            <div class="form-group col-md-6">
               <div class="form-row">
                 <div class="form-group col-md-4">
                   <!-- Subtotal (E)<?php echo "($INR)" ?> -->
@@ -3638,7 +3704,7 @@ if (!empty($getlogpodtl)) {
 
 
               <br>
-              <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+              <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
               <hr>
               <br>
               <div class="form-row">
@@ -3748,7 +3814,7 @@ if (!empty($getlogpodtl)) {
     </div>
   </div>
 </div><!-- /. view modal -->
-<!--/. 3rd modal new view-->
+<!--/. v i e w C A P I T A L -->
 
 
 <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
@@ -6069,6 +6135,7 @@ if (!empty($getlogpodtl)) {
 
 
   function Save(status) {
+    
     if (status == '0') {
       stat = '<?php echo PO_DRAFT; ?>';
     } else if (status == '2') {
@@ -8828,4 +8895,8 @@ if (!empty($getlogpodtl)) {
       $('#editpackagingcalmodel').css('z-index', ''); // Reset to default
     });
   });
+
+  function Reset() {
+    location.reload();
+  }
 </script>
\ No newline at end of file
diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php
index 267149cc..bac2778f 100755
--- a/app/Views/editEmployeenew.php
+++ b/app/Views/editEmployeenew.php
@@ -442,11 +442,11 @@ if (!empty($EmpDetails)) {
                                                             </select>
                                                         </div>
 
-                                                        <div class="col-md-4 pad">
+                                                        <div class="col-md-4 pad" style="margin-top: 36px;">
 
                                                             <input type="checkbox" id="isactive" <?php echo $IsActive; ?>
                                                                 name="isactive" value="1" onchange="handleCheckboxChange()">&nbsp;&nbsp;
-                                                            <label style="margin-top:8px;">
+                                                            <label>
                                                                 Is Active
                                                             </label>
                                                         </div>
diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php
index f9139f75..1500d30e 100755
--- a/app/Views/editImportAmendPO.php
+++ b/app/Views/editImportAmendPO.php
@@ -52,6 +52,29 @@
 	.cancel-btn:hover {
 		background-color: #f5c6cb;
 	}
+
+    .btn-soft-primary {
+		color: white;
+		background-color: rgb(42, 206, 150);
+		border-color: rgb(42, 206, 150);
+	}
+
+	.btn-soft-primary:hover {
+		background-color: rgb(32, 176, 130); /*  Slightly darker shade for hover */
+		border-color: rgb(32, 176, 130);
+	}
+    
+        /* 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>
 <?php
 $AvlAmount = 0;
@@ -1140,7 +1163,7 @@ if (!empty($RequistionDetails)) {
                                                         <!--End of Adding of freight in edit model -->
 
                                                             <br>
-                                                            <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+                                                            <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
                                                             <hr>
                                                             <br>
 
@@ -1570,76 +1593,55 @@ if (!empty($RequistionDetails)) {
                                     ?>
                                 </div>
                             </div>
-                            <!-- Start po file changes as per edit page -->
-                            <div class="form-row">
-								<div class="form-group col-md-12">
-									<label>Select Purchase Order File</label><br>
-									<input type="file" name="POFile" id="POFile">
-								</div>
-							</div>
 
-							<?php if (!empty($PrePOFile)) {
-								$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
-								if (file_exists($PrePOFilePath)) { ?>
-
-									<div class="form-row">
-										<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
-											<br />
-
-											<label><a title="Previous Upload PO File"
-													href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
-													<span>Previous Upload - </span>
-													<small><?= $PrePOFile; ?></small></a></label>
-											&nbsp;&nbsp;&nbsp;&nbsp;
-											<!-- <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button> -->
-
-											<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" />
-										</div>
+                            <!-- f i l e  c h o o s e n -->
+									<div class="col-md-12">
+									  <div class="row">
+											<div class="col-md-12">
+                                                <label>Select Purchase Order File</label><br>
+                                                <input type="file" name="POFile" id="POFile">
+                                            </div>
+											<?php if ($PrePOFile) { ?>
+											<div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
+                                                <label><a title="Previous Upload PO File"
+                                                        href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
+                                                        <span>Previous Upload - </span>
+                                                        <small><?= $PrePOFile; ?></small></a></label>
+                                                &nbsp;&nbsp;&nbsp;&nbsp;
+                                                <!-- <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i> </button> -->
+											</div>
+											<?php } ?>
+											<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+									  </div>
 									</div>
+									<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+									<!-- /. f i l e  c h o o s e n -->
+									
+									<br/>
+									<!-- h i d d e n  f i e l d s -->
+									<div class= "col-md-12">
+                                            <input type="hidden" name="txtPoRange" id="txtPoRange" />
+                                            <input type="hidden" name="isEdit" id="isEdit" value="0" />
+                                            <input type="hidden" name="txtStatus" id="txtStatus" />
+                                            <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo  $Rowcount; ?>" />
+                                            <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+                                            <input type="hidden" name="txtTotalorderValue" id="txtTotalorderValue" />
 
-								<?php } ?>
+                                            <input type="hidden" name="beforePlaceOforigin" id="beforePlaceOforigin" value="<?php echo $Import_PlaceofOrgin; ?>" />
+                                            <input type="hidden" name="beforePaymentterms" id="beforePaymentterms" value="<?php echo $PaymentTerms; ?>" />
 
-
-							<?php } ?>
-                            <!-- ends here -->
-
-                            <div class="form-row">
-                                <div class="form-group col-md-12" align="right"><br />
-
-                                    <input type="hidden" name="txtPoRange" id="txtPoRange" />
-                                    <input type="hidden" name="isEdit" id="isEdit" value="0" />
-                                    <input type="hidden" name="txtStatus" id="txtStatus" />
-                                    <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo  $Rowcount; ?>" />
-                                    <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
-                                    <input type="hidden" name="txtTotalorderValue" id="txtTotalorderValue" />
-
-                                    <input type="hidden" name="beforePlaceOforigin" id="beforePlaceOforigin" value="<?php echo $Import_PlaceofOrgin; ?>" />
-                                    <input type="hidden" name="beforePaymentterms" id="beforePaymentterms" value="<?php echo $PaymentTerms; ?>" />
-
-                                    <!-- <input type="hidden" name="beforeschedule" id="beforeschedule" value="<?php echo $DeliverySchedule; ?>"  />   
-                                                    <input type="hidden" name="beforeDispatch" id="beforeschedule" value="<?php echo $Import_DispatchDetails; ?>"  />   -->
-
-                                    <?php //if($PONOStatus == PO_DRAFT) {
-                                    ?>
-                                    <!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
-                                    <a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'amendmentpurchaseorder'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
-                                    <a class="btn btn-success"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                    <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-                                    <!-- <input type="reset" class="btn btn-success" value="Reset"> -->
-                                    <?php //}else {
-                                    ?>
-                                    <!-- <input type="reset" class="btn btn-success" value = "OK">  <?php //} 
-                                                                                                    ?>-->
-                                    <br />
-                                </div>
-                            </div>
-
-                            <div class="form-row">
-                                <div class="form-group col-md-12">
-                                    <label>Request On :</label><?php echo $Reqon; ?><br />
-                                    <label>Request By :</label><?php echo $RequesterName; ?><br />
-                                    <!--<label>Status :</label><?php echo $StatusName; ?>-->
-                                    <label>Status : </label><?php
+                                            <!-- <input type="hidden" name="beforeschedule" id="beforeschedule" value="<?php echo $DeliverySchedule; ?>"  />   
+                                                <input type="hidden" name="beforeDispatch" id="beforeschedule" value="<?php echo $Import_DispatchDetails; ?>"  />   -->
+									</div>
+									<!--/.h i d d e n  f i e l d s -->
+									<!-- f o o t e r  b u t t o n -->
+									<div class="col-md-12">
+										<div class="row">
+											<div class="col-md-5 text-left">
+                                                <label>Request On :</label><?php echo $Reqon; ?><br />
+                                                <label>Request By :</label><?php echo $RequesterName; ?><br />
+                                                <!--<label>Status :</label><?php echo $StatusName; ?>-->
+                                                <label>Status : </label><?php
                                                             $statusMappings = [
                                                                 'PO APPROVED' => 'AWAITING APPROVE',
                                                                 'AWAITING RELEASE' => 'AWAITING APPROVE',
@@ -1657,13 +1659,18 @@ if (!empty($RequistionDetails)) {
                                                                 echo "Status not provided";
                                                             }
                                                             ?>
+                                                            <br />
+											</div>
 
-                                </div>
-                            </div>
-
-
-
-
+											<div class="col-md-7 text-right">
+                                                    <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                    <a class="btn btn-success"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                    <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                    <br />
+											</div>
+										</div>
+									</div>
+									<!--/. f o o t e r  b u t t o n -->
 
                         </div> <!-- end card body-->
                     </div> <!-- end card -->
@@ -3270,4 +3277,5 @@ if (!empty($RequistionDetails)) {
 
 
     }
+    function Reset() { location.reload(); }
 </script>
\ No newline at end of file
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index 19c36ff6..26eca5e8 100755
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -52,6 +52,28 @@
 	.cancel-btn:hover {
 		background-color: #f5c6cb;
 	}
+	.btn-soft-primary {
+		color: white;
+		background-color: rgb(42, 206, 150);
+		border-color: rgb(42, 206, 150);
+	}
+
+	.btn-soft-primary:hover {
+		background-color: rgb(32, 176, 130); /*  Slightly darker shade for hover */
+		border-color: rgb(32, 176, 130);
+	}
+
+        /* 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>
 <?php $ReqType = '';
 $CompanyAddress = '';
@@ -1318,7 +1340,7 @@ if (!empty($INRSYMBOL)) {
 														</td>
 														<td class="text-right"><?php echo $record->Quantity ?></td>
 														<td><?php echo $record->UOM ?></td>
-														<td class="text-right"><?php echo $record->Rate ?></td>
+														<td class="text-right"><?php echo number_format($record->Rate, 2, '.', '');  ?></td>
 
 														<td class="text-right">
 															<?php echo number_format($record->BasicValue, 2, '.', '') ?></td>
@@ -1623,52 +1645,20 @@ if (!empty($INRSYMBOL)) {
 								</div>
 							</div>
 
-							<!-- Start po file changes as per edit page -->
-							<div class="form-row">
-								<div class="form-group col-md-12">
-									<label>Select Purchase Order File</label><br>
-									<input type="file" name="POFile" id="POFile">
-								</div>
-							</div>
-
-							<?php if (!empty($PrePOFile)) {
-								$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
-								if (file_exists($PrePOFilePath)) { ?>
-
-									<div class="form-row">
-										<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
-											<br />
-
-											<label><a title="Previous Upload PO File"
-													href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
-													<span>Previous Upload - </span>
-													<small><?= $PrePOFile; ?></small></a></label>
-											&nbsp;&nbsp;&nbsp;&nbsp;
-											<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
-
-											<input type="hidden" id="PrePOFile" name="PrePOFile"
-											value="<?php echo $PrePOFile; ?>" /><br>
-										</div>
-									</div>
-
-								<?php } ?>
-
-
-							<?php } ?>
-							<!-- ends here -->
-
 									<!-- f i l e  c h o o s e n -->
 									<div class="col-md-12">
 											<div class="row">
 													<div class="col-md-12">
 														<label>Select Purchase Order File</label><br>
 														<input type="file" name="POFile" id="POFile">
+														
 													</div>
-													<?php if ($PrePOFile) { 
+													<?php if (!empty($PrePOFile)) {
 														$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
 														if (file_exists($PrePOFilePath)) {
 													?>
-													<div class="col-md-12">
+													<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+													<div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
 													<label><a title="Previous Upload PO File"
 															href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
 															<span>Previous Upload - </span>
@@ -1676,7 +1666,6 @@ if (!empty($INRSYMBOL)) {
 													&nbsp;&nbsp;&nbsp;&nbsp;
 													<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
 
-													<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
 														
 													</div>
 													<?php }} ?>
@@ -1729,12 +1718,9 @@ if (!empty($INRSYMBOL)) {
 											</div>
 
 											<div class="col-md-7 text-right">
-												<input type="button" class="btn btn-secondary" value="Cancel"
-												onClick="window.location ='amendmentpurchaseorder';">
-												<a class="btn btn-success Save" onclick="Save(0)">&nbsp;&nbsp;<span
-													class="bold">Save as Draft</span></a>
-												<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
-													class="bold">Approve</span></a>
+                                                <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                <a class="btn btn-success"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
 								            </div>
 								        </div>
 
@@ -2368,8 +2354,8 @@ if (!empty($INRSYMBOL)) {
 				$('#EditQuantity').val($('#quantity' + userid).val());
 				$('#EditAmendPer').val($('#per' + userid).val());
 				tinyMCE.get('Edit_Service_Description').setContent($('#service_description' + userid).val());
-
-				$('#EditRate').val($('#itemRate' + userid).val());
+				var EdititemRate = parseFloat($('#itemRate' + userid).val()).toFixed(2);
+				$('#EditRate').val(EdititemRate);
 
 				$('#txtEditBasicValue').val(parseFloat(cellval[7].innerHTML).toFixed(2));
 				RequistQuantity = $('#quantity' + userid).val();
@@ -2447,7 +2433,7 @@ if (!empty($INRSYMBOL)) {
 				var editDescription = $("#EditItemName").val();
 				var editUOM = $('#EditUOM').val();
 				var editQuantity = $('#EditQuantity').val();
-				var itemRate = $("#EditRate").val();
+				var itemRate = parseFloat($("#EditRate").val()).toFixed(2);
 				var per = $("#EditAmendPer").val();
 				if (per == '') {
 					per = $('#EditUOM').val();
@@ -2503,7 +2489,7 @@ if (!empty($INRSYMBOL)) {
 				$('#materialName' + userid).val(editDescription);
 				$('#uom' + userid).val(editUOM);
 				$('#quantity' + userid).val(editQuantity);
-				$('#itemRate' + userid).val(itemRate);
+				$('#itemRate' + userid).val(parseFloat(itemRate).toFixed(2));
 				$('#DisType' + userid).val(DisType);
 				$('#DisVal' + userid).val(DisVal);
 				$('#AfterDisVal' + userid).val(AfterDisVal);
@@ -2879,5 +2865,5 @@ if (!empty($INRSYMBOL)) {
 			$('#freightmodel').css('z-index', '');  // Reset to default
 		});
 	});
-
+	function Reset() { location.reload(); }
 </script>
\ No newline at end of file
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 3cd5d4ca..e2d756a3 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -51,6 +51,29 @@
     .cancel-btn:hover {
         background-color: #f5c6cb;
     }
+
+	.btn-soft-primary {
+		color: white;
+		background-color: rgb(42, 206, 150);
+		border-color: rgb(42, 206, 150);
+	}
+
+	.btn-soft-primary:hover {
+		background-color: rgb(32, 176, 130); /*  Slightly darker shade for hover */
+		border-color: rgb(32, 176, 130);
+	}
+	
+        /* 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>
 <script>
 	$(document).ready(function () {
@@ -2914,7 +2937,7 @@ if (!empty($getlogpodtl)) {
 													<span>Previous Upload - </span>
 													<small><?= $PrePOFile; ?></small></a></label>
 											&nbsp;&nbsp;&nbsp;&nbsp;
-											<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
+											<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
 
 											</div>
 											<?php } ?>
@@ -2968,27 +2991,26 @@ if (!empty($getlogpodtl)) {
 											</div>
 
 											<div class="col-md-7 text-right">
-														<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
-														<a class="btn btn-secondary Save" ID="Cancel"
-															href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span
-																class="bold">Cancel</span></a>
-														<?php if ($PONOStatus == PO_DRAFT) { ?>
-															<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span
-																	class="bold">Save as Draft</span></a>
-														<?php } ?>
-														<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
-																class="bold">Submit</span></a>
-														<a class="btn btn-success  Save" ID="Submit"
-															onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-													<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
-															<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span
-																	class="bold">Submit</span></a>
-													<?php } else { ?>
-															<a class="btn btn-success" ID="OK"
-																href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span
-																	class="bold">OK</span></a>
-													<?php } ?>
-													
+													<?php if ($PONOStatus == PO_DRAFT) {  ?>
+                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                    <?php } else if ($PONOStatus == PO_CREATED) {  ?>
+                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                    <?php } else if ($PONOStatus == SPECIAL_PO) {  ?>
+                                                            <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
+                                                            <a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+													<?php } else if($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
+															<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                    <?php } else { ?>
+                                                            <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
+                                                    <?php } ?>
+                                                    <!-- $PONOStatus == REQITEM_Emergency_PO_CREATED -->
 											</div>
 										</div>
 									</div>
@@ -5986,5 +6008,5 @@ if (!empty($getlogpodtl)) {
 		});
 	}
 
-
+	function Reset() { location.reload(); }
 </script>
\ No newline at end of file
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index d47fd7e1..6c3a42c8 100755
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -52,6 +52,18 @@
 	.cancel-btn:hover {
 		background-color: #f5c6cb;
 	}
+
+	.btn-soft-primary {
+		color: white;
+		background-color: rgb(42, 206, 150);
+		border-color: rgb(42, 206, 150);
+	}
+
+	.btn-soft-primary:hover {
+		background-color: rgb(32, 176, 130); /*  Slightly darker shade for hover */
+		border-color: rgb(32, 176, 130);
+	}
+
 </style>
 <?php
 $insuranceStatus = array(
@@ -1365,7 +1377,7 @@ foreach ($PaymentTerms as $TER) {
 												$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
 												if (file_exists($PrePOFilePath)) {
 											?>
-											<div class="col-md-12">
+											<div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
 											<label><a title="Previous Upload PO File"
 													href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
 													<span>Previous Upload - </span>
@@ -1418,9 +1430,9 @@ foreach ($PaymentTerms as $TER) {
 											</div>
 
 											<div class="col-md-7 text-right">
-												<input  class="btn btn-secondary" type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
-												<a class="btn btn-success Save"   onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-												<a class="btn btn-success Save " ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                <a class="btn btn-success"  onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
 								            </div>
 								        </div>
 
@@ -2488,6 +2500,7 @@ foreach ($PaymentTerms as $TER) {
 		return TAXval; //  $('#AfterServiceTax').val(TAXval); 
 
 	}
+	function Reset() { location.reload(); }
 	$(document).ready(function () {
 	$("#PaymentTerms").change(function() {
 		if ($('#PaymentTerms').val().trim() == 'PT08') {
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index 1e6e85cb..63738401 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -52,6 +52,29 @@
     .cancel-btn:hover {
         background-color: #f5c6cb;
     }
+
+    .btn-soft-primary {
+		color: white;
+		background-color: rgb(42, 206, 150);
+		border-color: rgb(42, 206, 150);
+	}
+
+	.btn-soft-primary:hover {
+		background-color: rgb(32, 176, 130); /*  Slightly darker shade for hover */
+		border-color: rgb(32, 176, 130);
+	}
+    
+        /* 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>
 <script>
     $(document).ready(function() {
@@ -1297,46 +1320,33 @@ if (!empty($getlogpodtl)) {
 
                             </div> <!-- ends box-body -->
 
-                            <div class="form-row px-1">
-                                <label>Select Purchase Order File</label>
-                                <div class="form-group col-md-12" align="left">
-                                    <input type="file" class="" name="POFile" id="POFile">
-                                </div>
-
-                            </div>
-
-                            <?php if (!empty($PrePOFile)) {
-								$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
-								if (file_exists($PrePOFilePath)) { ?>
-
-									<div class="form-row">
-										<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
-											<br />
-
-											<label><a title="Previous Upload PO File"
+                                    <!-- f i l e  c h o o s e n -->
+									<div class="col-md-12">
+									  <div class="row">
+											<div class="col-md-12">
+												<label>Select Purchase Order File</label><br>
+                                                <input type="file" class="" name="POFile" id="POFile">											
+                                            </div>
+											<?php if ($PrePOFile) { ?>
+											<div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
+                                            <label><a title="Previous Upload PO File"
 													href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
 													<span>Previous Upload - </span>
 													<small><?= $PrePOFile; ?></small></a></label>
-											&nbsp;&nbsp;&nbsp;&nbsp;
-											<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
-
-											<input type="hidden" id="PrePOFile" name="PrePOFile"
-											value="<?php echo $PrePOFile; ?>" /><br>
-										</div>
+                                                    &nbsp;&nbsp;&nbsp;&nbsp;
+                                                    <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
+											</div>
+											<?php } ?>
+											<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+									  </div>
 									</div>
-
-								<?php } ?>
-
-
-							<?php } ?>
-
-                            <div class="form-row px-4 ">
-
-                                <div class="form-group col-md-12">
-
-                                    <div align="right">
-
-                                        <input type="hidden" name="txtPoRange" id="txtPoRange" />
+									<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+									<!-- /. f i l e  c h o o s e n -->
+									
+									<br/>
+									<!-- h i d d e n  f i e l d s -->
+									<div class= "col-md-12">
+                                    <input type="hidden" name="txtPoRange" id="txtPoRange" />
                                         <input type="hidden" name="isEdit" id="isEdit" value="0" />
                                         <input type="hidden" name="txtStatus" id="txtStatus" />
                                         <!-- <input type="hidden" name="txtRowCount" id="txtRowCount" /> -->
@@ -1345,39 +1355,15 @@ if (!empty($getlogpodtl)) {
                                         <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 
                                         <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
-
-                                        <a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
-                                        <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) {
-                                              if ($PONOStatus == PO_DRAFT) { ?>
-                                                   <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                              <?php } ?>
-                                                <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                <a class="btn btn-success waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-                                        <?php } else if($PONOStatus == PO_AMENDED){ ?>
-                                            <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
-                                        <?php } else { ?>
-                                            <?php if ($DEPCode == FINANCE) { ?>
-                                                <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
-                                            <?php } else { ?>
-                                                <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                <a class="btn btn-success Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-                                                <a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
-                                            <?php } ?>
-                                        <?php } ?>
-
-
-                                    </div>
-
-                                </div>
-
-                            </div>
-
-                            <div class="form-row px-1 ">
-                                <div class="form-group col-md-12" align="left">
-
-                                    <label>Request On :</label><?php echo $Reqon; ?><br />
-                                    <label>Request By :</label><?php echo $RequesterName; ?><br />
-                                    <label>Status : </label><?php
+									</div>
+									<!--/.h i d d e n  f i e l d s -->
+									<!-- f o o t e r  b u t t o n -->
+									<div class="col-md-12">
+										<div class="row">
+											<div class="col-md-5 text-left">
+                                            <label>Request On :</label><?php echo $Reqon; ?><br />
+                                            <label>Request By :</label><?php echo $RequesterName; ?><br />
+                                            <label>Status : </label><?php
                                                             $statusMappings = [
                                                                 'PO APPROVED' => 'AWAITING APPROVE',
                                                                 'AWAITING RELEASE' => 'AWAITING APPROVE',
@@ -1396,13 +1382,29 @@ if (!empty($getlogpodtl)) {
                                                             }
                                                             ?>
 
-                                    <br />
-                                </div>
-                            </div>
-
-
-
+                                                            <br />
+											</div>
 
+											<div class="col-md-7 text-right">
+                                                    <?php if ($PONOStatus == PO_DRAFT) {  ?>
+                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                    <?php } else if ($PONOStatus == PO_CREATED) {  ?>
+                                                            <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                            <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                    <?php } else if ($PONOStatus == SPECIAL_PO) {  ?>
+                                                            <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
+                                                            <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                    <?php } else { ?>
+                                                            <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
+                                                    <?php } ?>
+											</div>
+										</div>
+									</div>
+									<!--/. f o o t e r  b u t t o n -->
 
                         </div> <!-- end card body-->
                     </div> <!-- end card -->
@@ -1900,7 +1902,7 @@ if (!empty($getlogpodtl)) {
                                 <!--End of Adding of freight in edit model -->
 
                                 <br>
-                                <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+                                <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
                                 <hr>
                                 <br>
 
@@ -2477,7 +2479,7 @@ if (!empty($getlogpodtl)) {
                                 <br>
 
 
-                                <center> <label>Cost of the product Per UOM</label></center>
+                                <center> <label>Product Cost / UOM</label></center>
                                 <hr />
 
                                 <div class="form-row">
@@ -2939,7 +2941,7 @@ if (!empty($getlogpodtl)) {
 
                             <br>
 
-                            <center> <label>Cost of the product Per KG</label></center>
+                            <center> <label>Product Cost / UOM</label></center>
                             <hr />
 
                             <!--End of Adding of freight in edit model -->
@@ -5904,4 +5906,5 @@ if (!empty($getlogpodtl)) {
 
         }
     }
+    function Reset() { location.reload(); }
 </script>
\ No newline at end of file
diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php
index fe4c82bf..9c5f8aa1 100755
--- a/app/Views/editrequisitionform.php
+++ b/app/Views/editrequisitionform.php
@@ -48,6 +48,17 @@ if (!empty($ReqPOType)) {
     background-color: rgb(32, 176, 130); /*  Slightly darker shade for hover */
     border-color: rgb(32, 176, 130);
 }
+/* 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 */
+        }
 
 .th{
 	font-size: 14px;
@@ -198,7 +209,7 @@ td {
 								</div>
 							</div>
 							<div class="form-row">
-								<div class="table-responsive">
+								<div class="table-responsive scrollable-table">
 									<table id="Items" class="table table-striped table-hover mb-0" style="font-size:12px;">
 										<thead>
 											<tr>
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index 2ea46e8b..56790240 100755
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -128,6 +128,18 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
     .cancel-btn:hover {
         background-color: #f5c6cb;
     }
+    
+        /* 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>
 <script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
 <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
@@ -965,49 +977,37 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                             </div>
 
 
-
-
-
-                            <div class="form-row">
-                                <div class="form-group col-md-12">
-                                    <label>
-                                        Select Purchase Order File
-                                    </label>
-                                    <br>
-                                    <input type="file" name="POFile" id="POFile"><br>
-                                </div>
-                            </div>
-                            <br><br>
-
-
-
-
-                            <div class="form-row">
-
-
-                                <div class="form-group col-md-12" align="right">
-
-                                    <input type="hidden" name="txtPoRange" id="txtPoRange" />
-                                    <input type="hidden" name="isEdit" id="isEdit" value="0" />
-                                    <input type="hidden" name="txtStatus" id="txtStatus" />
-                                    <input type="hidden" name="txtRowCount" id="txtRowCount" />
-                                    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-                                    <input type="hidden" name="Budget" id="Budget" />
-                                    
-                                    <div class="btn-container" style="text-align: right;">
-
-											<!-- <a class="btn btn-success Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a> -->
-                                            <!-- <input type="reset" class="btn btn-success" value="Reset" onclick="window.location.reload()"> -->
-                                            <a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-											<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-											<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-
-                                            
+                                    <!-- f i l e  c h o o s e n -->
+									<div class="col-md-12">
+									  <div class="row">
+											<div class="col-md-12">
+                                                <label>Select Purchase Order File</label><br>
+												<input type="file" name="POFile" id="POFile"><br>
+											</div>
+									  </div>
 									</div>
-
-                                </div>
-
-                            </div>
+									<!-- /. f i l e  c h o o s e n -->
+									<!-- h i d d e n  f i e l d s -->
+									<div class= "col-md-12">
+                                        <input type="hidden" name="txtPoRange" id="txtPoRange" />
+                                        <input type="hidden" name="isEdit" id="isEdit" value="0" />
+                                        <input type="hidden" name="txtStatus" id="txtStatus" />
+                                        <input type="hidden" name="txtRowCount" id="txtRowCount" />
+                                        <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+                                        <input type="hidden" name="Budget" id="Budget" />
+									</div>
+									<!--/.h i d d e n  f i e l d s -->
+									<!-- f o o t e r  b u t t o n -->
+									<div class="col-md-12">
+										<div class="row">
+											<div class="col-md-12 text-right">
+                                                <a class="btn btn-danger Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+                                                <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+                                                <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+											</div>
+										</div>
+									</div>
+									<!--/. f o o t e r  b u t t o n -->
                         </div> <!-- end card body-->
                     </div> <!-- end card -->
                 </div><!-- end col-->
@@ -1477,7 +1477,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                 </div>
 
                                 <br>
-                                <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+                                <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
                                 <hr>
                                 <br>
 
@@ -2047,7 +2047,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
 
                                 <br>
-                                <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
+                                <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
                                 <hr>
                                 <br>
 
diff --git a/app/Views/includes/new_footer.php b/app/Views/includes/new_footer.php
index b0902d47..0d2c6d92 100755
--- a/app/Views/includes/new_footer.php
+++ b/app/Views/includes/new_footer.php
@@ -161,8 +161,8 @@
 
         var PONO = $('#txtPONO').val();
 
-      let confirmTrue=confirm(`Do you confirm to delete the Purchase order file for the PONO ${PONO} ?`);
-
+    //   let confirmTrue=confirm(`Do you confirm to delete the Purchase order file for the PONO ${PONO} ?`);
+      let confirmTrue=confirm(`Are you sure you want to delete the Purchase Order file for PONO ${PONO} ?`);
 
       if(confirmTrue){
 
@@ -185,6 +185,7 @@
 
               if (response) 
               alert(response.success);
+              location.reload();
               
               }
 
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index 54639ecf..72935ced 100755
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -51,6 +51,17 @@
     .cancel-btn:hover {
         background-color: #f5c6cb;
     }
+        /* 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>
 <script>
 	$(document).ready(function() {
@@ -481,7 +492,7 @@ if (!empty($INRSYMBOL)) {
 							$("#EditItemName").val(obj.MaterialName);
 							$("#EditUOM").val(obj.UOM);
 							$("#EditQuantity").val(obj.Quantity);
-							$("#EditRate").val(obj.material_rate);
+							$("#EditRate").val(parseFloat(obj.material_rate).toFixed(2));
 							RequistQuantity = obj.Quantity;
 						}
 					});
@@ -2291,8 +2302,8 @@ if (!empty($INRSYMBOL)) {
 							</div>
 
 
-							 <!-- f i l e  c h o o s e n -->
-							 <div class="col-md-12">
+									<!-- f i l e  c h o o s e n -->
+									<div class="col-md-12">
 									  <div class="row">
 											<div class="col-md-12">
                                                 <label>Select Purchase Order File</label><br>
@@ -2315,7 +2326,7 @@ if (!empty($INRSYMBOL)) {
 									<div class="col-md-12">
 										<div class="row">
 											<div class="col-md-12 text-right">
-												<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
+												<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
 												<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
 												<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
 											</div>
@@ -3293,7 +3304,7 @@ if (!empty($INRSYMBOL)) {
 			$('#EditItemName').val($('#materialName' + userid).val());
 			$('#EditUOM').val($('#uom' + userid).val());
 			$('#EditQuantity').val($('#quantity' + userid).val());
-			$('#EditRate').val($('#itemRate' + userid).val());
+			$('#EditRate').val(parseFloat($('#itemRate' + userid).val()).toFixed(2));
 			var p = $('#per' + userid).val()
 			if (p != "") {
 				$('#EditPer').val($('#per' + userid).val());
@@ -3485,7 +3496,7 @@ if (!empty($INRSYMBOL)) {
         </td>
 		<td style="text-align:right !important">${quantity}</td>
 		<td style="text-align:left !important">${uom}</td>
-		<td style="text-align:right !important">${itemRate}</td>
+		<td style="text-align:right !important">${parseFloat(itemRate).toFixed(2)}</td>
 		<td style="text-align:right !important">${basicval}</td>
 		<td style="text-align:right !important">${TotalTaxValue}</td>
 		<td style="text-align:right !important">${TotalOrderValue}</td>
@@ -3516,7 +3527,7 @@ if (!empty($INRSYMBOL)) {
 			addHidden(theForm, "materialName" + temp, materialName);
 			addHidden(theForm, "uom" + temp, uom);
 			addHidden(theForm, "quantity" + temp, quantity);
-			addHidden(theForm, "itemRate" + temp, itemRate);
+			addHidden(theForm, "itemRate" + temp, parseFloat(itemRate).toFixed(2));
 			addHidden(theForm, "per" + temp, per);
 			addHidden(theForm, "DisType" + temp, DisType);
 			addHidden(theForm, "DisVal" + temp, DisVal);
@@ -3559,7 +3570,7 @@ if (!empty($INRSYMBOL)) {
 			var editUOM = $('#EditUOM').val();
 			var editQuantity = $('#EditQuantity').val();
 
-			var itemRate = $("#EditRate").val();
+			var itemRate = parseFloat($("#EditRate").val()).toFixed(2);
 			var per = $('#EditPer').val();
 			if (per == "") {
 				per = $('#EditUOM').val();
@@ -3608,7 +3619,7 @@ if (!empty($INRSYMBOL)) {
 			$('#materialName' + userid).val(editDescription);
 			$('#uom' + userid).val(editUOM);
 			$('#quantity' + userid).val(editQuantity);
-			$('#itemRate' + userid).val(itemRate);
+			$('#itemRate' + userid).val(parseFloat(itemRate).toFixed(2));
 			$('#per' + userid).val(per);
 			$('#DisType' + userid).val(DisType);
 			$('#DisVal' + userid).val(DisVal);
diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php
index 5e3fcfae..50e95219 100755
--- a/app/Views/requisitionform.php
+++ b/app/Views/requisitionform.php
@@ -24,6 +24,17 @@ if (!empty($Emp)) {
     background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
     border-color: rgb(32, 176, 130);
 }
+		/* 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 */
+        }
 
 .th{
 	font-size: 14px;
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php
index 089c25a4..4022cf07 100755
--- a/app/Views/servicePurchaseorder.php
+++ b/app/Views/servicePurchaseorder.php
@@ -51,6 +51,17 @@
     .cancel-btn:hover {
         background-color: #f5c6cb;
     }
+        /* 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>
 <script>
     $(document).ready(function() {
@@ -1177,7 +1188,7 @@ if (!empty($INRSYMBOL)) {
 									<div class="col-md-12">
 										<div class="row">
 											<div class="col-md-12 text-right">
-												<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+												<a class="btn btn-danger Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
 												<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
 												<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
 											</div>
diff --git a/public/assets/js/CreatePOValidation.js b/public/assets/js/CreatePOValidation.js
index 7591250e..7bdeae58 100755
--- a/public/assets/js/CreatePOValidation.js
+++ b/public/assets/js/CreatePOValidation.js
@@ -171,6 +171,7 @@ function serviceValidate(){
 function capitalValidate(){
 	var radioValue = parseInt($("input[name='DateRange']:checked").val());
 	var PoType = $('#POType').val();
+	console.log("createPovalidation",capitalType);
 	if(PoType=='CAPITAL' && capitalType=='International'){