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/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php
index a680ad47..4fa4fd29 100755
--- a/app/Controllers/Inwardgateregister.php
+++ b/app/Controllers/Inwardgateregister.php
@@ -658,7 +658,8 @@ class Inwardgateregister extends BaseController
       
       if ($fileupdated_count > 0) {
           $finalstatement .= "Number of files updated: $fileupdated_count \n";
-          $finalstatement .= "Files: \n" . implode(PHP_EOL, $fileupdated_name);
+          // $finalstatement .= "Files: \n" . implode(PHP_EOL, $fileupdated_name);
+          $finalstatement .= "Files: \n" . implode(PHP_EOL, array_map(fn($file) => "• " . $file, $fileupdated_name));
       } else {
           $finalstatement .= "No files to update";
       }
@@ -811,21 +812,23 @@ function viewIGRDetails()
     $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'TransporterId'=>$TransporterId,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'Remark'=>$MasterRemarks);
 
     $MasterFile = $this->request->getfile('MasterFile');
+    $fileupdated_count = 0;
+    $fileupdated_name = []; 
 
-    if ($MasterFile) {
+    if (!empty($MasterFile)) {
       $requestMasterFileName = $MasterFile->getName(); 
       if ($MasterFile && $MasterFile->isValid() && !$MasterFile->hasMoved()) {
         if (!empty($this->inwardgateregister_model->isFileExistsInIGRmaster($requestMasterFileName))) {
           log_message('error', 'File already exists in the database'.$requestMasterFileName);
         }
         else{
-          $MasterFile->move($path, $requestMasterFileName);   
+          $MasterFile->move($path, $requestMasterFileName); 
+          $fileupdated_count++;
+          $fileupdated_name[] = $requestMasterFileName;    
           $igrarr['MasterFile'] = $requestMasterFileName;
         }
       }
     }
-    $fileupdated_count = 0;
-    $fileupdated_name = []; 
 
       $fileNames = $this->request->getPost('file_name');   
       $files = $this->request->getFileMultiple('emp_file');       
@@ -913,9 +916,16 @@ function viewIGRDetails()
 
     }
     if ($getigrstatus == 'ST027' && ($updateigrmaster > 0 || $updateigrlineitem > 0)) {
-    
-      
-      $result_for_email = $this->inwardgateregister_model->getDetailsforEmail($this->session->get('userId'));
+     
+      if(session()->get('roleText') == 'System Administrator') // id is 1
+      {
+        $roleId = 2;
+      }
+      else if(session()->get('roleText') == 'Auditor')  // id is 2
+      {
+        $roleId = 1;
+      }
+      $result_for_email = $this->inwardgateregister_model->getDetailsforEmail($this->session->get('userId'),$roleId);
       $result_for_history = $this->inwardgateregister_model->getHistoryDetailsforEmail($IGRNo);
       
      
@@ -982,6 +992,7 @@ function viewIGRDetails()
           $email_response = $notification->sendEmail([
               'recipient_email' => $email,
               'subject' => $result_for_email['company'].' - IGR Notification',
+              // 'carboncopy'=>Sales@resicoindustries.com,Factory@resicoindustries.com,Invoice@resicoindustries.com,
               // 'description' => 'IGR Number : '.$IGRNo.' is Edited By '.($result_for_email['full_name'] ?? $this->session->get('name'))." On ".date('d-m-Y H:i A', strtotime(get_current_date_time() . ' +30 seconds')). $history_content,
               'description' => $result_for_history['first_line']."<br>" .$history_content, 
               'company' => $result_for_email['company'],
@@ -1016,7 +1027,8 @@ function viewIGRDetails()
     
     if ($fileupdated_count > 0) {
         $finalstatement .= "Number of files updated: $fileupdated_count \n";
-        $finalstatement .= "Files: \n" . implode(PHP_EOL, $fileupdated_name);
+        // $finalstatement .= "Files: \n" . implode(PHP_EOL, $fileupdated_name);
+        $finalstatement .= "Files: \n" . implode(PHP_EOL, array_map(fn($file) => "• " . $file, $fileupdated_name));
     } else {
         $finalstatement .= "No files to update";
     }
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/Report.php b/app/Controllers/Report.php
index 366c643c..36f1c166 100755
--- a/app/Controllers/Report.php
+++ b/app/Controllers/Report.php
@@ -984,14 +984,19 @@ class Report extends BaseController
 		if ($this->request->getMethod(true) === 'POST' && $this->request->getPost('btn_submit')) {
 		
 			$cname = $this->request->getPost('client_name');
+			$data['client_name'] = $cname;
 			$prod = $this->request->getPost('item_name');
+			$data['item_name'] = $prod;
 			$frm = $this->request->getPost('from_date');
+			$data['from_date'] = $frm;
 			$t = $this->request->getPost('to_date');
+			$data['to_date'] = $t;
 			$m = $this->request->getPost('month');
+			$data['month'] = $m;
 			$purchaseorder_number = $this->request->getPost('purchaseorder_number');
-			
-			
+			$data['purchaseorder_number'] = $purchaseorder_number;
 			$ab = $this->request->getPost('financialyear');
+			$data['financialyear'] = $ab;
 			$fa = substr((string)$ab, 0, -5);
 			$aa = substr((string)$ab, 5, 5);
 
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/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php
index 57eba79c..e8c54b66 100755
--- a/app/Models/Inwardgateregister_model.php
+++ b/app/Models/Inwardgateregister_model.php
@@ -1300,7 +1300,7 @@ $builder = $this->db->table('t_igr_history')
         ];  
 	}
 
-	public function getDetailsforEmail($userId,$roleId = 2)
+	public function getDetailsforEmail($userId,$roleId)
     {
 		$query0 = $this->db->query("
             SELECT CompanyName,EmailAddress
diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index 713769ef..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() {
@@ -1301,8 +1323,8 @@ if (!empty($getlogpodtl)) {
 														</td>
 														<td style="text-align:left !important;"><?php echo $record->Quantity ?></td>
 														<td><?php echo $record->UOM ?></td>
-
-														<td style="text-align:right !important;"><?php echo $record->Rate ?></td>
+														
+														<td style="text-align:right !important;"><?php echo number_format($record->Rate, 2); ?></td>
 
 														<td style="text-align:right !important;"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
 
@@ -1612,98 +1634,86 @@ if (!empty($getlogpodtl)) {
 											</table>
 										</div>
 									</div>--> <?php } else {} ?> 
+									<!-- ends here -->
 
-
-									<div class="form-row">
-											<div class="form-group col-md-12 px-4">
+									<!-- 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 id="deletePreviousPurchaseOrderFileDiv">
-												<div class="form-group col-md-12 px-4">
+											<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;
-												<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
-												</div>
+												<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>
-									<!-- ends here -->
-
-
-									<div class="form-group col-md-12 px-4">
-
-
-
-										<div align="right"><br />
-											<div>
-
-											</div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
-											<input type="hidden" name="txtStatus" id="txtStatus" />
-											<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
-																												echo $index;
-																											} ?>">
-											<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-
-											<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
-
-											<?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>
+									<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="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+										<input type="hidden" name="txtStatus" id="txtStatus" />
+										<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo isset($index) ? $index : ''; ?>">
+										<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+										<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
+									</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 isset($Reqon) ? $Reqon : ''; ?><br />
+												<?php if (!empty($RequesterName)) { ?>
+													<label>Request By:</label> <?php echo $RequesterName; ?><br />
 												<?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 } ?>
-
-										</div>
-
-									</div>
-
-									<div class="form-group col-md-12 px-4">
-										<div align="left">
-											<label>Request On : </label><?php if (isset($Reqon)) {
-																			echo $Reqon;
-																		} ?><br />
-											<?php if (isset($RequesterName)) {
-												if ($RequesterName != '' || $RequesterName != null) { ?>
-													<label>Request By : </label><?php echo $RequesterName; ?><br />
-											<?php
-												}
-											} ?>
-											<!-- <label>Status : </label><?php echo $StatusName; ?> -->
-											<label>Status : </label><?php
-																	$statusMappings = [
-																		'PO APPROVED' => 'AWAITING APPROVE',
-																		'AWAITING RELEASE' => 'AWAITING APPROVE',
-																		'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-																		'PO RELEASED' => 'PO APPROVED',
-																	];
-
-																	if (isset($StatusName) && !empty($StatusName)) {
-																		if (isset($statusMappings[$StatusName])) {
-																			echo $statusMappings[$StatusName];
-																		} else {
-																			echo $StatusName;
-																		}
-																	} else {
-																		echo "Status not provided";
-																	}
-																	?>
-
-
+												<label>Status:</label> 
+												<?php
+												$statusMappings = [
+													'PO APPROVED' => 'AWAITING APPROVE',
+													'AWAITING RELEASE' => 'AWAITING APPROVE',
+													'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+													'PO RELEASED' => 'PO APPROVED',
+												];
+												echo isset($StatusName) && !empty($StatusName) ? ($statusMappings[$StatusName] ?? $StatusName) : "Status not provided";
+												?>
+											</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" 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>
-
+									<!--/. f o o t e r  b u t t o n -->
 							</div>
 
 						</div> <!-- end card body-->
@@ -1948,7 +1958,7 @@ if (!empty($getlogpodtl)) {
 					</div>
 				</div>
 				<div class="modal-footer">
-					<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
+					<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
 					<a class="btn btn-success font AddService" ID="AddService"><span class="bold">Add Service</span></a>
 				</div>
 			</form>
@@ -2567,7 +2577,6 @@ if (!empty($getlogpodtl)) {
 
 		tinyMCE.triggerSave();
 		if (validateServiceTax()) {
-			// alert('inside Addservice');
 			var temp = parseInt(index) + 1;
 			var Reqnumber = $('#ReqNo').val();
 			var departmentName = $('#deptName').val();
@@ -2656,7 +2665,7 @@ if (!empty($getlogpodtl)) {
 			} else {
 				rowHtml += `<td>-</td>`;
 			}
-			rowHtml += `<td align="right">${quantity}</td>
+			rowHtml += `<td align="left">${quantity}</td>
 						<td align="left">${uom}</td>
 						<td align="right">${itemRate}</td>
 						<td align="right">${basicval}</td>
@@ -3478,7 +3487,9 @@ if (!empty($getlogpodtl)) {
 				$('#EditPer').val($('#per' + userid).val());
 				$('#EditQuantity').val($('#quantity' + userid).val());
 				RequistQuantity = $('#quantity' + userid).val();
-				$('#EditRate').val($('#itemRate' + userid).val());
+				RateValue = $('#itemRate' + userid).val();
+				RateValue = parseFloat(RateValue).toFixed(2)
+				$('#EditRate').val(RateValue);
 				$('#txtEditBasicValue').val(cellval[8].innerHTML);
 				$('#EditCgst').val($('#Cgst' + userid).val());
 				$('#EditSgst').val($('#Sgst' + userid).val());
@@ -3589,7 +3600,9 @@ if (!empty($getlogpodtl)) {
 				$('#ViewUOM').val($('#uom' + userid).val());
 				$('#ViewQuantity').val($('#quantity' + userid).val());
 				RequistQuantity = $('#quantity' + userid).val();
-				$('#ViewRate').val($('#itemRate' + userid).val());
+				RateValue = $('#itemRate' + userid).val();
+				RateValue = parseFloat(RateValue).toFixed(2)
+				$('#ViewRate').val(RateValue);
 				$('#txtViewBasicValue').val(cellval[8].innerHTML);
 				$('#ViewCgst').val($('#Cgst' + userid).val());
 				$('#ViewSgst').val($('#Sgst' + userid).val());
@@ -3878,4 +3891,5 @@ if (!empty($getlogpodtl)) {
 
 		}
 	});
+	function Reset() { location.reload(); }
 </script>
\ No newline at end of file
diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php
index bc2f926f..a4c5eafd 100755
--- a/app/Views/Report_pending_purchase.php
+++ b/app/Views/Report_pending_purchase.php
@@ -60,14 +60,6 @@
 							
 						</div>
 					</div>
-					<?php if(isset($headline)) : if(!empty($headline)) : ?>
-
-					<div class="col-12">
-						<div class="page-title-right">			
-							<span>Result filter by : </span><h4 class="page-title" style="display: inline;"><?php echo $headline; ?></h4>  
-                        </div>
-					</div>
-					<?php endif; endif; ?>	
 				</div>
 				<div class="row">
 					<div class="col-12">
@@ -87,7 +79,7 @@
 													<option value="">Select Supplier</option>
 													<?php
 													foreach ($cust as $item): { ?>
-															<option value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName;  ?></option>
+															<option <?php if(isset($client_name) && ($client_name == $item->SupplierName)){ echo 'selected'; } ?> value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName;  ?></option>
 													<?php }
 													endforeach; ?>
 												</select>
@@ -100,7 +92,7 @@
 													<option value="">Select Material</option>
 													<?php
 													foreach ($material as $it): { ?>
-															<option value="<?php echo $it->MaterialName; ?>"><?php echo $it->MaterialName;  ?></option>
+															<option <?php if(isset($item_name) && ($item_name == $it->MaterialName)){ echo 'selected'; } ?> value="<?php echo $it->MaterialName; ?>"><?php echo $it->MaterialName;  ?></option>
 													<?php }
 													endforeach; ?>
 												</select>
@@ -113,7 +105,7 @@
 													<option value="">Select Year</option>
 													<?php
 													foreach ($finyear as $item): { ?>
-															<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year;  ?></option>
+															<option <?php if(isset($financialyear) && ($financialyear == $item->financial_year)){ echo 'selected'; } ?> value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year;  ?></option>
 													<?php }
 													endforeach; ?>
 												</select>
@@ -125,18 +117,10 @@
 												<div class="input-group">
 													<select class="form-control" id="month" name="month">
 														<option value="">Select Month</option>
-														<option value="January">January</option>
-														<option value="February">February</option>
-														<option value="March">March</option>
-														<option value="April">April</option>
-														<option value="May">May</option>
-														<option value="June">June</option>
-														<option value="July">July</option>
-														<option value="August">August</option>
-														<option value="September">September</option>
-														<option value="October">October</option>
-														<option value="November">November</option>
-														<option value="December">December</option>
+														<?php $months = ["January", "February", "March", "April", "May", "June","July", "August", "September", "October", "November", "December"]; ?> 
+														<?php foreach ($months as $m): { ?>
+																<option <?php if(isset($month) && ($month == $m)){ echo 'selected'; } ?> value="<?php echo $m; ?>"><?php echo $m;  ?></option>
+														<?php } endforeach; ?>
 													</select>
 												</div>
 											</div>
@@ -147,8 +131,7 @@
 													<?php echo 'From Date'; ?>
 												</label>
 												<div class="input-group">
-													<input name="from_date" id="max-date" class="form-control datepicker">
-
+													<input type="date" class="form-control" name="from_date" id="max-date" value="<?php if(isset($from_date)){ echo $from_date; } ?>">
 												</div>
 											</div>
 											<div class="col-2">
@@ -156,7 +139,7 @@
 													<?php echo 'To Date'; ?>
 												</label>
 												<div class="input-group">
-													<input name="to_date" id="min-date" class="form-control datepicker">
+													<input type="date" class="form-control" name="to_date" id="min-date" value="<?php if(isset($to_date)){ echo $to_date; } ?>">
 												</div>
 
 											</div>
@@ -168,7 +151,7 @@
 													<option value="">Select PO NO</option>
 													<?php
 													foreach ($pono as $po): { ?>
-															<option value="<?php echo $po->po; ?>"><?php echo $po->po.'-'.$po->type;  ?></option>
+															<option <?php if(isset($purchaseorder_number) && ($purchaseorder_number == $po->po)){ echo 'selected'; } ?> value="<?php echo $po->po; ?>"><?php echo $po->po.'-'.$po->type;  ?></option>
 													<?php }
 													endforeach; ?>
 												</select>
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 01011b4b..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>
@@ -6719,7 +6741,6 @@ if (!empty($INRSYMBOL)) {
     $('.AddService').click(function () {
         tinyMCE.triggerSave();
         if (validateServiceTax()) {
-            // alert('inside Addservice');
             var temp = index;
             console.log('temp = ' + temp);
             var Reqnumber = $('#purpose').val();
@@ -6939,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('');
@@ -7003,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 !== '') {
@@ -7425,7 +7448,6 @@ if (!empty($INRSYMBOL)) {
             }
         });
         console.log("Data before AJAX call:", Object.fromEntries(formData));
-return;
 
         // Perform form validation
         if (validate()) {
@@ -7741,7 +7763,6 @@ return;
 
         tinyMCE.triggerSave();
         if (validateEditRevenueTax()) {
-            //alert('inside Add');          
             var CostCode = $("#EditRevenueCostCenter").val();
             var AvilBudget = $('#EditRevenueAvlBudAmt').val();
             var editMaterialCode = $("#EditRevenueMaterialCode").val();
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index 6bb5e4d3..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() {
@@ -977,31 +989,39 @@ if (!empty($INRSYMBOL)) {
 
                             <br>
 
-                            <div class="form-row">
-                                <div class="form-group">
-                                    <label>Select Purchase Order File</label><br>
-                                    <input type="file" name="POFile" id="POFile"><br>
-                                </div>
-                            </div><!-- form-row 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" name="POFile" id="POFile"><br>
+											</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" />
+                                        <!--<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" /> -->
+									</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 align="right" style="padding:1% 0%;">
-
-
-                                <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" />
-                                <!--<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" /> -->
-
-
-                                <!-- <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-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><!-- hiden and button -->
                             <br />
                         </div> <!-- end card body-->
                     </div> <!-- end card -->
@@ -1128,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">
@@ -1183,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
@@ -1599,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>
 
@@ -1737,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>
@@ -1792,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>
@@ -2263,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">
@@ -4504,6 +4512,7 @@ if (!empty($INRSYMBOL)) {
             var formData = new FormData($('.CapitalPO')[0]);
             formData.append('ExchangeRateOn', ExchangeRateOn);
             formData.append('PaymentMethod', PaymentMethod);
+            // console.log("Data before AJAX call:", Object.fromEntries(formData));
             $('#loader').show();
             // disableButtons();
             $.ajax({
@@ -5277,6 +5286,8 @@ if (!empty($INRSYMBOL)) {
             $('#EDITCAPdiv').hide();
             $('#datedomestic').hide();
             $('#dispatchinternational').show();
+            $('#DummyDiv').hide();
+            $('#DummyEditDiv').hide();
 
 
 
@@ -5295,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 dd753064..fb7a822a 100755
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -4,7 +4,6 @@
 		align-items: center;
 		gap: 10px;
 	}
-    $CapitalRange
 	.edit-input-field {
 		padding: 2px;
 		font-size: 14px;
@@ -52,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;
@@ -386,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';
@@ -409,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';
@@ -1663,96 +1688,83 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                 </div>
                             </div><!-- /.Special Instructions section -->
 
-                            <!-- 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"
+                            <!-- 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) { 
+														$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
+														if (file_exists($PrePOFilePath)) {
+													?>
+													<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 } ?>
-                            <!-- /.file section -->
-
-                            <!-- for button -->
-                            <div class="form-row">
-                                <div class="form-group col-md-12" align="right"><br>
-                                    <div class="btn-container" style="text-align: right;">
+									<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="txtDeletedRow" id="txtDeletedRow" />
+									</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">
+                                                <?php $UpdatedOn = new DateTime($UpdatedOn, new DateTimeZone('Asia/Kolkata'));
+                                                $UpdatedOn = $UpdatedOn->format('d-m-Y'); ?>
+                                                <label>Request On :</label><?php echo $UpdatedOn; ?><br />
+                                                <?php if ($RequesterName != '' || $RequesterName != null) { ?>
+                                                    <label>Request By : </label><?php echo $RequesterName; ?><br />
+                                                <?php } ?>
+                                                <!-- <label>Status :</label><?php echo $PoStatusName; ?> -->
+                                                <label>Status : </label><?php
+                                                $statusMappings = [
+                                                    'PO APPROVED' => 'AWAITING APPROVE',
+                                                    'AWAITING RELEASE' => 'AWAITING APPROVE',
+                                                    'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+                                                    'PO RELEASED' => 'PO APPROVED',
+                                                ];
 
+                                                if (isset($PoStatusName) && !empty($PoStatusName)) {
+                                                    if (isset($statusMappings[$PoStatusName])) {
+                                                        echo $statusMappings[$PoStatusName];
+                                                    } else {
+                                                        echo $PoStatusName;
+                                                    }
+                                                } else {
+                                                    echo "Status not provided";
+                                                }
+                                                ?>
+											</div>
 
-                                        <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>
+											<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>
+								            </div>
+								        </div>
 
-                                    </div>
-
-
-                                </div>
-                            </div>
-                            <!-- /.button section --> 
-
-                            <div class="form-row">
-                                <div class="form-group col-md-12">
-                                    <?php $UpdatedOn = new DateTime($UpdatedOn, new DateTimeZone('Asia/Kolkata'));
-                                    $UpdatedOn = $UpdatedOn->format('d-m-Y'); ?>
-                                    <label>Request On :</label><?php echo $UpdatedOn; ?><br />
-                                    <?php if ($RequesterName != '' || $RequesterName != null) { ?>
-                                        <label>Request By : </label><?php echo $RequesterName; ?><br />
-                                    <?php } ?>
-                                    <!-- <label>Status :</label><?php echo $PoStatusName; ?> -->
-                                    <label>Status : </label><?php
-                                    $statusMappings = [
-                                        'PO APPROVED' => 'AWAITING APPROVE',
-                                        'AWAITING RELEASE' => 'AWAITING APPROVE',
-                                        'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-                                        'PO RELEASED' => 'PO APPROVED',
-                                    ];
-
-                                    if (isset($PoStatusName) && !empty($PoStatusName)) {
-                                        if (isset($statusMappings[$PoStatusName])) {
-                                            echo $statusMappings[$PoStatusName];
-                                        } else {
-                                            echo $PoStatusName;
-                                        }
-                                    } else {
-                                        echo "Status not provided";
-                                    }
-                                    ?>
-                                    <br />
-
-                                </div>
-                            </div>
-                            <!-- /.Status details section --> 
+									</div>
+									<!--/. f o o t e r  b u t t o n -->
 
                         </div> <!-- end card body-->
                     </div> <!-- end card -->
@@ -1875,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">
@@ -1921,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
@@ -2342,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>
                                                             
@@ -5227,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 5dd4d777..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() {
@@ -301,10 +325,6 @@ if (!empty($getlogpodtl)) {
     text-align: right;
   }
 
-
-
-
-
   .centered {
     display: flex;
     /* justify-content: center; */
@@ -403,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>
 
 
@@ -527,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">
@@ -886,7 +931,7 @@ if (!empty($getlogpodtl)) {
                   <?php } ?>
                 </div>
                 <br>
-              </div>
+              </div><!--/. f o r m - r o w 874-->
 
               <div class="box-body">
                 <div class="form-row">
@@ -906,8 +951,8 @@ if (!empty($getlogpodtl)) {
                           <th style="white-space: nowrap !important; text-align:right !important">Tax Amount<?php echo "($INR)" ?></th>
                           <th style="white-space: nowrap !important; text-align:right !important">Total Order Amount<?php echo "($INR)" ?></th>
                           <!-- <th>Actual Quantity</th>
-                        <th>Received Quantity</th>
-                        <th>Pending Quantity</th> -->
+                          <th>Received Quantity</th>
+                          <th>Pending Quantity</th> -->
                           <th>Action</th>
                         </tr>
                       </thead>
@@ -967,8 +1012,8 @@ if (!empty($getlogpodtl)) {
 
 
                               <!-- <td style="text-align:right !important"><?php echo $record->Quantity ?></td>
-                    <td style="text-align:right !important"><?php echo $record->ReceivedQuantity ?></td>
-                    <td style="text-align:right !important"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
+                              <td style="text-align:right !important"><?php echo $record->ReceivedQuantity ?></td>
+                              <td style="text-align:right !important"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
                               <?php
                               $row = array("materialCode" => $record->MaterialCode, "ReqNo" => $record->ReqNo);
                               array_push($res_arr_values, $row);
@@ -1227,10 +1272,11 @@ if (!empty($getlogpodtl)) {
                                     data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
                                 <?php
                               } else { ?>
-                                <td> 
+                                <td>
                                   <a data-target='#VIEWCAPITAL' data-id="<?php echo $index; ?>"
                                     data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWCAPITAL"><i
-                                      class="fa fa-eye" data-toggle="tooltip"></i>&nbsp;&nbsp;&nbsp;</a> </td>
+                                      class="fa fa-eye" data-toggle="tooltip"></i>&nbsp;&nbsp;&nbsp;</a>
+                                </td>
                               <?php
                               } ?>
                             </tr> <?php
@@ -1298,15 +1344,9 @@ if (!empty($getlogpodtl)) {
                         ?>
                       </tbody>
                     </table>
-                  </div>
-                </div>
-              </div>
-
-
-
-
-
-
+                  </div><!--/. t a b l e - r e s p o n s i v e -->
+                </div><!--/. f o r m - r o w 888-->
+              </div><!--/. b o x - b o d y 887-->
 
               <div class="form-row" id="CAPdiv">
                 <div class="form-group col-md-3">
@@ -1363,7 +1403,7 @@ if (!empty($getlogpodtl)) {
                   ?>
 
                 </div>
-              </div>
+              </div><!-- C A P d i v grandtotal 1302-->
 
               <div class="form-row" style="padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
 
@@ -1451,7 +1491,7 @@ if (!empty($getlogpodtl)) {
 
 
 
-              </div>
+              </div><!-- H i d e I m p o r t T a x T o t a l grandtotal 1359-->
 
               <div class="form-row"> <!-- style="padding:1% 1%;" -->
                 <div class="form-group col-md-4">
@@ -1462,9 +1502,7 @@ if (!empty($getlogpodtl)) {
                   echo form_input($data);
                   ?>
                 </div>
-              </div>
-
-
+              </div><!-- H i d e I m p o r t T a x T o t a l 1447 -->
 
               <!--##################################################################   -->
               <?php if (!empty($update)) { ?>
@@ -1546,6 +1584,7 @@ if (!empty($getlogpodtl)) {
               <?php } else {
               } ?>
 
+              <!-- S p e c i a l  I n s t r u c t i o n s  r o w -->
               <div class="form-row">
                 <div class="form-group col-md-12">
                   <label>Special Instructions </label> <?php
@@ -1553,110 +1592,102 @@ if (!empty($getlogpodtl)) {
                                                         echo form_textarea($data);
                                                         ?>
                 </div>
-              </div>
+              </div><!-- S p e c i a l  I n s t r u c t i o n s  r o w 1539-->
 
-              <br>
-              <label> Select Purchase Order File </label>
-              <div class="form-row" align="left">
-                <div class="form-group col-md-12">
+              <br />
+              <!-- f i l e  c h o o s e n -->
+              <div class="col-md-12">
+                <div class="row">
+                  <div class="col-md-12">
 
-                  <input type="file" name="POFile" id="POFile">
-
-                </div>
-              </div>
-              <br>
-              <div class="form-row" id="deletePreviousPurchaseOrderFileDiv" align="left">
-                <div class="form-group col-md-12">
+                    <label>Select Purchase Order File</label><br>
+                    <input type="file" name="POFile" id="POFile">
+                  </div>
                   <?php if ($PrePOFile) { ?>
-                    <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;
-                    <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
+                    <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;
+                      <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
+
+
+                    </div>
                   <?php } ?>
-                </div>
-              </div>
-
-              <div style="text-align:right !important" style="padding:3% 2%;">
-                <div>
-
-
                   <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-->
+              <div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+
+              <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="txtDeletedRow" id="txtDeletedRow" />
-
                 <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
-
-
-                <?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 } ?>
-
               </div>
+              <!--/.h i d d e n  f i e l d s 1575-->
 
-              <label>Request On :</label><?php echo $UpdatedOn; ?><br />
-              <label>Request By :</label><?php echo $requestedBy; ?><br />
-              <!--<label>Status :</label><?php echo $PoStatusName; ?> -->
-              <label>Status : </label><?php
-                                      $statusMappings = [
-                                        'PO APPROVED' => 'AWAITING APPROVE',
-                                        'AWAITING RELEASE' => 'AWAITING APPROVE',
-                                        'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-                                        'PO RELEASED' => 'PO APPROVED',
-                                      ];
+              <!-- 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 $UpdatedOn; ?><br />
+                    <label>Request By :</label><?php echo $requestedBy; ?><br />
+                    <label>Status : </label><?php
+                                            $statusMappings = [
+                                              'PO APPROVED' => 'AWAITING APPROVE',
+                                              'AWAITING RELEASE' => 'AWAITING APPROVE',
+                                              'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+                                              'PO RELEASED' => 'PO APPROVED',
+                                            ];
 
-                                      if (isset($PoStatusName) && !empty($PoStatusName)) {
-                                        if (isset($statusMappings[$PoStatusName])) {
-                                          echo $statusMappings[$PoStatusName];
-                                        } else {
-                                          echo $PoStatusName;
-                                        }
-                                      } else {
-                                        echo "Status not provided";
-                                      }
-                                      ?>
-
-
-
-
-
-            </div> <!-- end card body-->
-          </div> <!-- end card -->
-        </div><!-- end col-->
-      </div><!-- row -->
-    </div> <!-- container -->
-  </div> <!-- content -->
-</div>
+                                            if (isset($PoStatusName) && !empty($PoStatusName)) {
+                                              if (isset($statusMappings[$PoStatusName])) {
+                                                echo $statusMappings[$PoStatusName];
+                                              } else {
+                                                echo $PoStatusName;
+                                              }
+                                            } else {
+                                              echo "Status not provided";
+                                            }
+                                            ?>
+                  </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" 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>
+              <!--/. f o o t e r  b u t t o n 1585-->
 
+            </div> <!-- end card body 534-->
+          </div> <!-- end card 533-->
+        </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;">
@@ -1682,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">
@@ -1717,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">
@@ -1748,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 ;">
@@ -1812,19 +1844,6 @@ if (!empty($getlogpodtl)) {
             </div>
           </div>
 
-          <div class="form-row">
-            <div class="form-group col-md-9"></div>
-            <div class="form-group col-md-3" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;">
-              <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">
               <label>Item Code<span class="text-danger">*</span></label>
@@ -1866,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">
@@ -2331,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">
@@ -2427,13 +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">
@@ -2495,18 +2519,7 @@ if (!empty($getlogpodtl)) {
 
           </div><!-- /.1strow-->
 
-          <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>
-              <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><!-- /.2ndrow-->
+
 
           <div class="form-row" style="padding: 0px;">
             <div class="form-group col-md-3">
@@ -2548,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">
@@ -2987,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">
@@ -3082,25 +3102,31 @@ if (!empty($getlogpodtl)) {
       </form>
     </div><!-- /.content -->
   </div>
-</div><!-- /.modal -->
-<!-- 3rd modal new view-->
-<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;">
+</div><!-- /. e d i t C A P I T A L -->
+
+<!-- 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 ;">
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title">View Capital Purchase Order Item</h4>
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-      </div><!-- /. h e a d e r -->
+      </div><!--/. m o d a l - h e a d e r -->
       <form>
         <div class="modal-body p-4">
           <div class="form-row">
             <div class="form-group col-md-3">
               <label>Req No<span class="text-danger">*</span></label>
               <div>
+
                 <?php
                 $data = array('name' => 'ViewReqnumber', 'value' => set_value('ViewReqnumber'), 'id' => 'ViewReqnumber', 'class' => 'form-control', 'readonly' => 'true');
                 echo form_input($data);
                 ?>
+
+
+
               </div>
             </div>
             <div class="form-group col-md-3">
@@ -3112,11 +3138,10 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-
             <div class="form-group col-md-3">
               <label>Cost Center Code</label>
               <div>
-              <?php
+                <?php
                 $data = array('name' => 'ViewCostCenter', 'value' => set_value('ViewCostCenter'), 'id' => 'ViewCostCenter', 'class' => 'form-control', 'readonly' => 'true');
                 echo form_input($data);
                 ?>
@@ -3125,29 +3150,15 @@ if (!empty($getlogpodtl)) {
             <div class="form-group col-md-3">
               <label>Avail Bud Amount<?php echo "($INR)" ?></label>
               <div class="form-group">
-              <?php
+                <?php
                 $data = array('name' => 'ViewCapitalbudAmt', 'value' => set_value('ViewCapitalbudAmt'), 'id' => 'ViewCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true');
                 echo form_input($data);
                 ?>
               </div>
             </div>
-
-          </div><!-- /.1strow-->
+          </div>
 
           <div class="form-row">
-            <div class="form-group col-md-9"></div>
-            <div class="form-group col-md-3" id="ExchangeRateModalViewDiv" style="display:none;">
-              <label> Exchange Rate</label>
-              <div class="form-group">
-                <?php
-                $data = array('name' => 'ViewExchangeRtModal', 'value' => set_value('ViewExchangeRtModal'), 'id' => 'ViewExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
-                echo form_input($data);
-                ?>
-              </div>
-            </div>
-          </div><!-- /.2ndrow-->
-
-          <div class="form-row" style="padding: 0px;">
             <div class="form-group col-md-3">
               <label>Item Code<span class="text-danger">*</span></label>
               <div>
@@ -3178,46 +3189,83 @@ if (!empty($getlogpodtl)) {
             <div class="form-group col-md-3">
               <label>Quantity<span class="text-danger">*</span></label>
               <div class="form-group">
-              <?php
+                <?php
                 $data = array('name' => 'ViewCPQuantity', 'value' => set_value('ViewCPQuantity'), 'id' => 'ViewCPQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
                 echo form_input($data);
                 ?>
               </div>
             </div>
-          </div><!-- /.3rdrow-->
+
+          </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="ViewRateIn">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>Per</label> 
-              <?php $data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'class' => 'form-control', 'readonly' => 'true');
-              echo form_input($data); ?>
+                <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" style="padding-right: 0px;">
-              <label id="ViewTotalAmount">Basic value <?php echo "($INR)" ?></label>
-              <div class="form-group">
+            
+            <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' => 'ViewCPTotalAmount', 'value' => set_value('ViewCPTotalAmount'), 'id' => 'ViewCPTotalAmount', 'class' => 'form-control num', '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 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>
 
-          </div><!-- /.4throw-->
-
-          <div class="form-row" style="padding:0px;" id="VIEWCAPdiv">
+          <div class="form-row" id="VIEWCAPdiv" style="padding:0px;">
             <div class="form-group col-md-3">
             </div>
             <div class="form-group col-md-3">
@@ -3238,10 +3286,10 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-3" style="padding:0px;">
-              <label>Discounted Amt <?php echo "($INR)" ?> </label>
+            <div class="form-group col-md-3"> <!--style="padding:0px"> -->
+              <label>Discounted Amt <?php echo "($INR)" ?></label>
               <div class="form-group">
-              <?php
+                <?php
                 $data = array('name' => 'txtViewAfterDiscount', 'value' => set_value('txtViewAfterDiscount'), 'id' => 'txtViewAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
                 echo form_input($data);
                 ?>
@@ -3253,7 +3301,6 @@ if (!empty($getlogpodtl)) {
               <label>Freight Type </label>
               <?php
               $options = array("0" => 'Select Freight Type');
-              //print_r(  $options);
               if (!empty($FreightType)) {
                 foreach ($FreightType as $SID):
                   $options[$SID->ConfigValue] = $SID->ConfigValue;
@@ -3262,7 +3309,8 @@ if (!empty($getlogpodtl)) {
               echo form_dropdown('drpFreightviewloc', $options, set_value(field: 'drpFreightviewloc'), 'id="drpFreightviewloc" disabled class="form-control "');
               ?>
             </div>
-            <div class="form-group col-md-3" id="TripsValuelocedit" style="display:none;">
+
+            <div class="form-group col-md-3" id="TripsValuelocview" style="display:none;">
               <label>NO Of Trips</label>
               <?php
               $data = array('name' => 'NOOfTripslocview', 'value' => set_value('NOOfTripslocview'), 'id' => 'NOOfTripslocview', 'class' => 'form-control num', 'onchange' => 'calculateFreightlocviewper();', 'disabled' => 'disabled');
@@ -3276,16 +3324,16 @@ if (!empty($getlogpodtl)) {
               echo form_input($data);
               ?>
             </div>
-            <div class="form-group col-md-3" style="padding: 1px;">
+
+            <div class="form-group col-md-3" style="padding-left: -2px;">
               <label>Freight Amt <?php echo "($INR)"; ?></label>
               <?php
               $data = array('name' => 'txtAfterFreightlocview', 'value' => set_value('txtAfterFreightlocview'), 'id' => 'txtAfterFreightlocview', 'class' => 'form-control num', 'readonly' => 'true');
               echo form_input($data);
               ?>
             </div>
-
             <div class="form-group col-md-6" style="text-align:right !important">
-              <label> CGST In % <label>
+              <label> CGST In % </label>
             </div>
 
             <div class="form-group col-md-3">
@@ -3306,31 +3354,28 @@ if (!empty($getlogpodtl)) {
               </div>
 
             </div>
-          </div><!-- /.5throw-->
+          </div>
 
-          <div class="form-row" id="VIEWCAPdiv1">
-            
+          <div class="form-row" id="VIEWCAPdiv3" style="padding:0px">
             <div class="form-group col-md-6" style="text-align:right !important">
               <label> SGST In % </label>
+
             </div>
+
             <div class="form-group col-md-3">
               <div class="form-group">
 
                 <?php
                 $data = array('name' => 'ViewSgst', 'value' => set_value('ViewSgst'), 'id' => 'ViewSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'readonly' => 'true');
+
                 echo form_input($data);
                 ?>
               </div>
 
-              </div>
-              </div>
-
-            </div><!-- SGST1 -->
             </div>
-
-            </div><!-- SGST1 -->
             <div class="form-group col-md-3">
               <div class="form-group">
+
                 <?php
                 $data = array('name' => 'ViewAfterSgst', 'value' => set_value('ViewAfterSgst'), 'id' => 'ViewAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
                 echo form_input($data);
@@ -3338,9 +3383,10 @@ if (!empty($getlogpodtl)) {
               </div>
 
             </div>
-          </div><!-- /.C.D1-->
 
-          <div class="form-row" id="VIEWCAPdiv2">
+          </div>
+
+          <div class="form-row" id="VIEWCAPdiv2" style="padding:0px">
             <div class="form-group col-md-6" style="text-align:right !important">
               <label> IGST In % </label>
             </div>
@@ -3359,20 +3405,20 @@ if (!empty($getlogpodtl)) {
               <div class="form-group">
 
                 <?php
+
                 $data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst'), 'id' => 'ViewAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+
                 echo form_input($data);
                 ?>
               </div>
 
             </div>
 
-          </div><!-- /.C.D2-->
-
-          <div class="form-row" id="VIEWCAPdiv3">
+          </div>
+          <div class="form-row" id="VIEWCAPdiv1" style="padding:0px">
             <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
               <label>Other Allowances <?php echo "($INR)" ?></label>
             </div>
-
             <div class="form-group col-md-3">
               <div class="form-group">
                 <?php
@@ -3392,35 +3438,37 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-          </div><!-- /.C.D3-->
 
-          <div class="form-row" style="padding:1%;"></div><!-- /.layer-->
 
-          <div class="form-row" style="border:1px solid #000;padding:0px;" id="ViewModalImportTaxHide"
-            style="display:none;">
+          </div>
+
+          <div class="form-row" style="padding:1%;"></div>
+          <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)" ?>
                 </div>
                 <div class="form-group col-md-4">
-                  <div class="form-group" style="display:none;">
-                    <?php
-                        $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                        echo form_input($data);
-                    ?>
+                  <div style="display:none;">
+                    <div class="form-group">
+                      <?php
+                      $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+                      echo form_input($data);
+                      ?>
+                    </div>
                   </div>
                 </div>
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                        $data = array('name' => 'ViewAfterBasicPriceTax', 'value' => set_value('ViewAfterBasicPriceTax'), 'id' => 'ViewAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true');
-                        echo form_input($data);
+                    $data = array('name' => 'ViewAfterBasicPriceTax', 'value' => set_value('ViewAfterBasicPriceTax'), 'id' => 'ViewAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true');
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
-              </div><!-- f1strow -->
+              </div>
               <div class="form-row">
                 <div class="form-group col-md-4">
                   Landing charge <?php echo "($INR)" ?>
@@ -3428,24 +3476,20 @@ if (!empty($getlogpodtl)) {
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                        $data = array('name' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                        echo form_input($data);
+                    $data = array('name' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                        $data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true');
-                        echo form_input($data);
-                        ?>
-                        ?>
-
+                    $data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true');
+                    echo form_input($data);
                     ?>
-
                   </div>
                 </div>
-              </div><!-- 2ndrow -->
+              </div>
               <div class="form-row">
                 <div class="form-group col-md-4">
                   Assessable Value (A) <?php echo "($INR)" ?>
@@ -3453,20 +3497,22 @@ if (!empty($getlogpodtl)) {
                 <div class="form-group col-md-4">
                   <div class="form-group" style="display: none;">
                     <?php
-                        $data = array('name' => 'ViewHighseas ', 'value' => set_value('ViewHighseas'), 'id' => 'ViewHighseas', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                        echo form_input($data);
+                    $data = array('name' => 'ViewHighseas ', 'value' => set_value('ViewHighseas'), 'id' => 'ViewHighseas', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+
+
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                        $data = array('name' => 'ViewAfterAssessable', 'value' => set_value('ViewAfterAssessable'), 'id' => 'ViewAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true');
-                        echo form_input($data);
+                    $data = array('name' => 'ViewAfterAssessable', 'value' => set_value('ViewAfterAssessable'), 'id' => 'ViewAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true');
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
-              </div><!-- 3rdrow -->
+              </div>
               <div class="form-row">
                 <div class="form-group col-md-4">
                   Custom duty (B)<?php echo "($INR)" ?>
@@ -3474,24 +3520,23 @@ if (!empty($getlogpodtl)) {
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                        $data = array('name' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                        echo form_input($data);
-                        ?>
-                        ?>
-
+                    $data = array('name' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                    echo form_input($data);
                     ?>
-
                   </div>
                 </div>
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                    $data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty', 'class' => 'form-control', 'readonly' => 'true');
+                    $data = array('name' => 'ViewAfterCustomduty', 'value' => set_value('ViewAfterCustomduty'), 'id' => 'ViewAfterCustomduty', 'class' => 'form-control', 'readonly' => 'true');
                     echo form_input($data);
                     ?>
                   </div>
                 </div>
-              </div><!-- 4throw -->
+              </div>
+
+
+
               <div class="form-row">
                 <div class="form-group col-md-4">
                   Custom ED_cess (C)<?php echo "($INR)" ?>
@@ -3499,20 +3544,20 @@ if (!empty($getlogpodtl)) {
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                        $data = array('name' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                        echo form_input($data);
+                    $data = array('name' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                        $data = array('name' => 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true');
-                        echo form_input($data);
+                    $data = array('name' => 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true');
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
-              </div><!-- 5throw -->
+              </div>
               <div class="form-row">
                 <div class="form-group col-md-4">
                   Custom S & H cess (D)<?php echo "($INR)" ?>
@@ -3520,28 +3565,31 @@ if (!empty($getlogpodtl)) {
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                        $data = array('name' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                        echo form_input($data);
+                    $data = array('name' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                        $data = array('name' => 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true');
-                        echo form_input($data);
+                    $data = array('name' => 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true');
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
-              </div><!-- 6throw -->
-            </div><!-- 1st 6th-->
-            <div class="form-group col-md-6" style="padding:10px;">
+              </div>
+            </div><!--/. f o r m - g r o u p  c o l - m d -6-->
+            <div class="form-group col-md-6">
               <div class="form-row">
                 <div class="form-group col-md-4">
-                  Subtotal (E) <?php echo "($INR) (A+B+C+D)" ?>
+                  <!-- Subtotal (E)<?php echo "($INR)" ?> -->
+                  Subtotal (E)
+                  <?php echo "($INR)  (A+B+C+D)" ?>
                 </div>
                 <div class="form-group col-md-4">
-                  <div class="form-group" style="display: none;">
+                  <div class="form-group" style="display: none">
                     <?php
                     $data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
                     echo form_input($data);
@@ -3556,16 +3604,21 @@ if (!empty($getlogpodtl)) {
                     ?>
                   </div>
                 </div>
-              </div><!-- 7throw -->
+              </div>
+
+
+
+
+
               <div class="form-row">
                 <div class="form-group col-md-4">
                   <!-- Additional Excise duty : (g) -->
-                  IGST on (E): (F) <?php echo " ($INR)"; ?>
+                  IGST on (E): (F)<?php echo " ($INR)"; ?>
                 </div>
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                    $data = array('name' => 'ViewIgstInt ', 'value' => set_value('ViewIgstInt', 0), 'id' => 'ViewIgstInt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'EditCalculateIgst()');
+                    $data = array('name' => 'ViewIgstInt', 'value' => set_value('ViewIgstInt', 0), 'id' => 'ViewIgstInt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'EditCalculateIgst()');
                     echo form_input($data);
                     ?>
                   </div>
@@ -3578,10 +3631,23 @@ if (!empty($getlogpodtl)) {
                     ?>
                   </div>
                 </div>
-              </div><!-- 8throw -->
+              </div>
+
+
+
+
+
+
+
+
+
+
+
               <div class="form-row">
                 <div class="form-group col-md-8">
-                  Total Duty (G) <?php echo "($INR)" ?>
+                  <!-- Total Duty (G)<?php echo "($INR)" ?> -->
+                  Total Duty (G)
+                  <?php echo "($INR) (B+C+D+F)" ?>
                 </div>
                 <div class="form-group col-md-4">
                   <div class="form-group">
@@ -3591,7 +3657,9 @@ if (!empty($getlogpodtl)) {
                     ?>
                   </div>
                 </div>
-              </div><!-- 9throw -->
+              </div>
+
+
               <!--Start of Adding of Frieght model-->
               <div class="form-row" style="padding:0px;">
                 <div class="form-group col-md-4">
@@ -3604,9 +3672,10 @@ if (!empty($getlogpodtl)) {
                     endforeach;
                   }
                   echo form_dropdown('drpViewFreight', $options, set_value('drpViewFreight'), 'id="drpViewFreight"', 'class="form-control "');
+
                   ?>
                 </div>
-                <div class="form-group col-md-4" id="EditTripsValue" style="display:none;">
+                <div class="form-group col-md-4" id="ViewTripsValue" style="display:none;">
                   <span>NO Of Trips</span>
                   <?php
                   $data = array('name' => 'ViewNOOfTrips', 'value' => set_value('ViewNOOfTrips'), 'id' => 'ViewNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(2);');
@@ -3617,9 +3686,11 @@ if (!empty($getlogpodtl)) {
                   <span>Freight Rate </span>
                   <?php
                   $data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);');
+
                   echo form_input($data);
                   ?>
                 </div>
+
                 <div class="form-group col-md-4" style="padding-left: 0px;">
                   <span>Freight Amt <?php echo "($INR)" ?></span>
                   <?php
@@ -3627,10 +3698,13 @@ if (!empty($getlogpodtl)) {
                   echo form_input($data);
                   ?>
                 </div>
-              </div><!-- 10throw -->
+
+              </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">
@@ -3640,37 +3714,39 @@ if (!empty($getlogpodtl)) {
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                  $data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                  echo form_input($data);
+                    $data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
-                <div class="form-group col-md-4" style="margin-top: -20px;">
+                <div class="form-group col-md-4" style="margin-top:-20px;">
                   <span>Quantity</span>
                   <div class="form-group">
                     <?php
-                  $data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                  echo form_input($data);
+
+                    $data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
 
-              </div><!-- 11throw -->
+              </div>
               <div class="form-row">
 
                 <div class="form-group col-md-4">
-                  Custom Duty Expenses <?php echo "($INR)/UOM" ?>
+                  Custom Duty Expenses <?php echo "($INR)/UOM " ?>
                 </div>
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                  $data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                  echo form_input($data);
+                    $data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
 
-              </div><!-- 12throw -->
+              </div>
               <div class="form-row">
                 <div class="form-group col-md-4">
                   Clearing Charges <?php echo "($INR)" ?>
@@ -3678,8 +3754,9 @@ if (!empty($getlogpodtl)) {
                 <div class="form-group col-md-4">
                   <div class="form-group">
                     <?php
-                  $data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
-                  echo form_input($data);
+                    $data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
+
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
@@ -3687,13 +3764,14 @@ if (!empty($getlogpodtl)) {
 
 
 
-                <div class="form-group col-md-4" style="margin-top: -19px;">
+                <div class="form-group col-md-4" style="margin-top: -25px;">
                   <!-- RMC Including Customers -->
-                  <span><?php echo "Net per UOM($INR)"; ?></span>
+                  <span><?php echo "Net per Uom($INR)"; ?></span>
                   <div class="form-group">
                     <?php
-                  $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
-                  echo form_input($data);
+                    $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
+
+                    echo form_input($data);
                     ?>
                   </div>
                 </div>
@@ -3702,8 +3780,7 @@ if (!empty($getlogpodtl)) {
                 </div>
 
 
-
-              </div><!-- 13throw -->
+              </div>
               <div class="form-row">
                 <!-- <div class="form-group col-md-6" style="text-align:right !important" style="display:none;"> <label>Total Order Amount :</label></div> -->
                 <div class="form-group col-md-6" style="display:none;">
@@ -3717,8 +3794,10 @@ if (!empty($getlogpodtl)) {
               </div><!-- 14throw row hidden -->
 
 
-            </div><!-- 2nd 6th-->
-          </div><!-- Import.Tax.Hide -->
+            </div>
+
+          </div>
+
           <div class="form-row">
             <div class="form-group col-md-12">
               <label>Capital Description </label>
@@ -3726,19 +3805,16 @@ if (!empty($getlogpodtl)) {
               $data = array('name' => 'ViewItemDescription', 'value' => set_value('ViewItemDescription'), 'id' => 'ViewItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
               echo form_textarea($data); ?>
             </div>
-          </div><!-- C.Desc -->
-        </div><!-- /.body -->
+          </div>
+        </div>
         <div class="modal-footer">
-        <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
-          <?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?>
-            <!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> -->
-           <?php } ?>
-        </div><!-- /.footer -->
+          <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
+        </div>
       </form>
-    </div><!-- /.content -->
+    </div>
   </div>
-</div><!-- /.modal -->
- <!--/. 3rd modal new view-->
+</div><!-- /. view modal -->
+<!--/. 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>
@@ -5096,12 +5172,12 @@ if (!empty($getlogpodtl)) {
   function calculateTaxValue() {
     var Cgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
     var Sgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
-    
+
     var Igst = 0.00;
     if (capitalType == 'Domestic') {
       Igst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
-    } 
-    if(capitalType == 'International') {
+    }
+    if (capitalType == 'International') {
       Igst = $('#AfterIgstInt').val() == '' ? '0.00' : $('#AfterIgstInt').val(); // caps interna
     }
     var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
@@ -5142,7 +5218,7 @@ if (!empty($getlogpodtl)) {
     var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val();
 
     var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
-    console.log("$('#AfterLandingCharge').val()",$('#AfterLandingCharge').val());
+    console.log("$('#AfterLandingCharge').val()", $('#AfterLandingCharge').val());
 
     var CustomDuty = $('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val();
 
@@ -5470,7 +5546,7 @@ if (!empty($getlogpodtl)) {
    */
   function populateValueMainFormForDeleteServiceTax(deletedRow) {
 
-    var rows =  document.getElementById('serviceTax').rows.length;
+    var rows = document.getElementById('serviceTax').rows.length;
     var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
     var TotalOrderValueSummary = 0;
 
@@ -6059,6 +6135,7 @@ if (!empty($getlogpodtl)) {
 
 
   function Save(status) {
+    
     if (status == '0') {
       stat = '<?php echo PO_DRAFT; ?>';
     } else if (status == '2') {
@@ -6118,6 +6195,7 @@ if (!empty($getlogpodtl)) {
 
       console.log(fileInput.vlaue);
       console.log(prePOFileInput.value);
+      // console.log("Data before AJAX call:", Object.fromEntries(formData));
 
       if (fileInput && fileInput.vlaue && fileInput.files.length > 0) {
         formData.append('POFile', fileInput.files[0]);
@@ -6134,6 +6212,7 @@ if (!empty($getlogpodtl)) {
 
         formData.append(inputID, input.val());
       });
+      // console.log("Data before AJAX call:", Object.fromEntries(formData));
       $.ajax({
         data: formData,
         processData: false,
@@ -6479,8 +6558,8 @@ if (!empty($getlogpodtl)) {
       var AfterCgst = $("#EditAfterCgst").val();
       var Sgst = $("#EditSgst").val();
       var AfterSgst = $("#EditAfterSgst").val();
-      var Igst = $("#EditIgst").val();//Dom Caps
-      var AfterIgst = $("#EditAfterIgst").val();//Dom Caps
+      var Igst = $("#EditIgst").val(); //Dom Caps
+      var AfterIgst = $("#EditAfterIgst").val(); //Dom Caps
       var OtherAmt = parseFloat($("#EditOtherAllowances").val() == '' ? "0.00" : $('#EditOtherAllowances').val()).toFixed(2);
 
       var TotalTaxValue = EditcalculateTaxValue();
@@ -6638,7 +6717,7 @@ if (!empty($getlogpodtl)) {
       $('#ClearingCharge' + userid).val(ClearingCharges);
 
 
-      var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;  
+      var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;
 
       cellval[2].innerHTML = materialCode;
       cellval[3].innerHTML = shorten;
@@ -6647,7 +6726,7 @@ if (!empty($getlogpodtl)) {
       cellval[6].innerHTML = uom;
       cellval[7].innerHTML = parseFloat(itemRate).toFixed(2);
       cellval[8].innerHTML = parseFloat(basicval).toFixed(2);
-      cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2);// what should i display here ?? if international means
+      cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2); // what should i display here ?? if international means
       cellval[10].innerHTML = parseFloat(Total).toFixed(2);
 
 
@@ -6808,8 +6887,8 @@ if (!empty($getlogpodtl)) {
     var Igst = 0.00;
     if (capitalType == 'Domestic') {
       Igst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); // caps dom 
-    } 
-    if(capitalType == 'International') {
+    }
+    if (capitalType == 'International') {
       Igst = $('#EditAfterIgstInt').val() == '' ? '0.00' : $('#EditAfterIgstInt').val(); // caps interna
     }
     console.log(Igst);
@@ -6867,8 +6946,8 @@ if (!empty($getlogpodtl)) {
    */
   function populateValueMainFormForEditCapitalTax() {
 
-    var rows =  document.getElementById('serviceTax').rows.length;
-    console.log("rr",rows);
+    var rows = document.getElementById('serviceTax').rows.length;
+    console.log("rr", rows);
     var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
     var TotalOrderValueSummary = 0;
 
@@ -6911,7 +6990,7 @@ if (!empty($getlogpodtl)) {
       var discountedRateValue = $('#AfterDisVal' + i).val() == '' ? '0.00' : $('#AfterDisVal' + i).val();
 
       var TotLandingI = $('#landingCharge' + i).val() == '' ? '0.00' : $('#landingCharge' + i).val();
-      console.log(TotLandingI,"TotLandingI");
+      console.log(TotLandingI, "TotLandingI");
 
       var TotCustomI = $('#CustomDuty' + i).val() == '' ? '0.00' : $('#CustomDuty' + i).val();
 
@@ -7019,7 +7098,7 @@ if (!empty($getlogpodtl)) {
 
   function populateValueMainFormForViewCapitalTax() {
 
-    var rows =  document.getElementById('serviceTax').rows.length;
+    var rows = document.getElementById('serviceTax').rows.length;
     var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
 
     var TotalOrderValueSummary = 0;
@@ -8210,8 +8289,8 @@ if (!empty($getlogpodtl)) {
 
 
   function populateValueMainFormForupdateCapitalTax() {
-    
-    var rows =  document.getElementById('serviceTax').rows.length;
+
+    var rows = document.getElementById('serviceTax').rows.length;
     var TotalFreight = 0;
     var i = 0;
     do {
@@ -8816,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/editOldemppay.php b/app/Views/editOldemppay.php
index c368285c..7e92e7b8 100755
--- a/app/Views/editOldemppay.php
+++ b/app/Views/editOldemppay.php
@@ -127,6 +127,16 @@ if (!empty($emppay)) {
     .num {
         text-align: right;
     }
+    .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>
 
 <div class="content-page">
@@ -253,7 +263,12 @@ if (!empty($emppay)) {
                                                     <div class="row">
                                                             <div class="col-md-12">
                                                                 <div class="form-group">
-                                                                    <label class="d-block" for="request_letter">Request letter</label>
+                                                                    <label class="d-block" for="request_letter">
+                                                                       Request letter 
+                                                                       <!-- <?php if ($request_letter) { ?>
+                                                                        <a class="btn btn-soft-primary waves-effect waves-light btn-sm" title="Download Previous Upload - <?= $request_letter; ?>" href="<?php echo base_url() . 'public/uploads/images/' . $request_letter ?>"><i class="fa fa-download"></i></a>
+                                                                       <?php } ?> -->
+                                                                    </label>
                                                                     <input type="file" accept=".docx,.pdf,.doc,.jpg,.png" id="request_letter" name="request_letter" style="margin-top: 5px;" />
                                                                     <input type="hidden" id="hidden_request_letter" name="hidden_request_letter" value="<?php echo $request_letter; ?>" />
                                                                 </div>
@@ -271,17 +286,23 @@ if (!empty($emppay)) {
                                                     <div class="row">
                                                             <div class="col-md-12">
                                                                 <div class="form-group">
-                                                                    <label class="d-block" for="payment_statement">Payment Receipt</label>
+                                                                    <label class="d-block" for="payment_statement">
+                                                                        Payment Receipt 
+                                                                        <!-- <?php if ($payment_statement) { ?>
+                                                                            <a class="btn btn-soft-primary waves-effect waves-light btn-sm" title="Download Previous Upload - <?= $payment_statement; ?>"  href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>"><i class="fa fa-download"></i></a>
+                                                                        <?php } ?> -->
+                                                                    </label>
                                                                     <input type="file" accept=".docx,.pdf,.doc,.jpg,.png" id="payment_statement" name="payment_statement" style="margin-top: 5px;" />
                                                                     <input type="hidden" id="hidden_payment_statement" name="hidden_payment_statement" value="<?php echo $payment_statement; ?>" />
                                                                     
                                                                 </div>
-                                                                <?php if ($request_letter) { ?>
-                                                                    <span class="help-block"><small>
-                                                                        <a href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>">
-                                                                                <span>Previous Upload - </span><small><?= $payment_statement; ?></small>
-                                                                        </a>
-                                                                    </small></span>
+                                                                <?php if ($payment_statement) { ?>
+                                                                    <div class="mb-1">
+                                                                            <a href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>">
+                                                                                    <span>Previous Upload - </span><small><?= $payment_statement; ?></small>
+                                                                            </a>
+                                                                    </div>
+                                                                    <br>
                                                                 <?php } ?>
                                                             </div>
                                                     </div> <!-- 2nd row div closed here -->
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index c4f4e758..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,45 +1645,38 @@ 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>
+									<!-- 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 (!empty($PrePOFile)) {
+														$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
+														if (file_exists($PrePOFilePath)) {
+													?>
+													<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>
+															<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>
 
-							<?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 }} ?>
+											</div>
 									</div>
-
-								<?php } ?>
-
-
-							<?php } ?>
-							<!-- ends here -->
-
-							<!-- for Button -->
-							<div class="form-row">
-								<div class="form-group col-md-12" align="right"><br />
-									<div class="btn-container" style="text-align: right;">
-
+									<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" />
@@ -1670,51 +1685,47 @@ if (!empty($INRSYMBOL)) {
 										<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
 										<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 										<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
-
-										<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>
-
-										<!-- <input type="reset" class="btn btn-success" value = "OK">  -->
 									</div>
-								</div>
-							</div>
-							<!-- ends button -->
+									<!--/.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">
+											<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
+													$Reqon = $Reqon->format('d-m-Y'); ?>
+													<label>Request On :</label><?php echo $Reqon; ?><br>
+													<?php if ($RequesterName != '' || $RequesterName != null) { ?>
+														<label>Request By : </label><?php echo $RequesterName; ?><br />
+													<?php } ?>
+													<label>Status : </label><?php
+													$statusMappings = [
+														'PO APPROVED' => 'AWAITING APPROVE',
+														'AWAITING RELEASE' => 'AWAITING APPROVE',
+														'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+														'PO RELEASED' => 'PO APPROVED',
+													];
 
-							<!-- for Status details -->
-							<div class="form-row">
-								<div class="form-group col-md-12">
-									<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
-									$Reqon = $Reqon->format('d-m-Y'); ?>
-									<label>Request On :</label><?php echo $Reqon; ?><br>
-									<?php if ($RequesterName != '' || $RequesterName != null) { ?>
-										<label>Request By : </label><?php echo $RequesterName; ?><br />
-									<?php } ?>
-									<label>Status : </label><?php
-									$statusMappings = [
-										'PO APPROVED' => 'AWAITING APPROVE',
-										'AWAITING RELEASE' => 'AWAITING APPROVE',
-										'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-										'PO RELEASED' => 'PO APPROVED',
-									];
+													if (isset($POStatus) && !empty($POStatus)) {
+														if (isset($statusMappings[$POStatus])) {
+															echo $statusMappings[$POStatus];
+														} else {
+															echo $POStatus;
+														}
+													} else {
+														echo "Status not provided";
+													}
+													?>
+											</div>
 
-									if (isset($POStatus) && !empty($POStatus)) {
-										if (isset($statusMappings[$POStatus])) {
-											echo $statusMappings[$POStatus];
-										} else {
-											echo $POStatus;
-										}
-									} else {
-										echo "Status not provided";
-									}
-									?>
-								</div>
-							</div>
-							<!-- ends Status -->
+											<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>
+								            </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-->
@@ -2343,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();
@@ -2422,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();
@@ -2478,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);
@@ -2854,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 2ef5bd63..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 () {
@@ -2898,115 +2921,100 @@ if (!empty($getlogpodtl)) {
 							<?php } else {
 							} ?>
 
-							<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 />
 
+							<!-- 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">Delete</button>
+											<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 } ?>
+											<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 if (isset($index)) {
+												echo $index;
+											} ?>">
+											<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+											<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+											<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
+											<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
+									</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 />
+													<?php if ($RequesterName != '' || $RequesterName != null) { ?>
+														<label>Request By : </label><?php echo $RequesterName; ?><br />
+													<?php } ?>
+													<label>Status : </label><?php
+													$statusMappings = [
+														'PO APPROVED' => 'AWAITING APPROVE',
+														'AWAITING RELEASE' => 'AWAITING APPROVE',
+														'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+														'PO RELEASED' => 'PO APPROVED',
+													];
+
+													if (isset($StatusName) && !empty($StatusName)) {
+														if (isset($statusMappings[$StatusName])) {
+															echo $statusMappings[$StatusName];
+														} else {
+															echo $StatusName;
+														}
+													} else {
+														echo "Status not provided";
+													}
+													?>
+											</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" 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>
-
-								<?php } ?>
-
-
-							<?php } ?>
-
-
-							<div class="form-row">
-								<div class="form-group col-md-12" align="left"><br />
-									<div>
-
-
-									</div>
-									<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 if (isset($index)) {
-										echo $index;
-									} ?>">
-									<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-									<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
-									<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
-									<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
-									<div class="btn-container" style="text-align: 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 } ?>
-									</div>
-
-
-
-								</div><br />
-							</div>
-
-
-
-
-
-
-							<div class="form-row">
-								<div class="form-group col-md-12">
-
-									<label>Request On : </label><?php echo $Reqon; ?><br />
-									<?php if ($RequesterName != '' || $RequesterName != null) { ?>
-										<label>Request By : </label><?php echo $RequesterName; ?><br />
-									<?php } ?>
-									<label>Status : </label><?php
-									$statusMappings = [
-										'PO APPROVED' => 'AWAITING APPROVE',
-										'AWAITING RELEASE' => 'AWAITING APPROVE',
-										'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-										'PO RELEASED' => 'PO APPROVED',
-									];
-
-									if (isset($StatusName) && !empty($StatusName)) {
-										if (isset($statusMappings[$StatusName])) {
-											echo $statusMappings[$StatusName];
-										} else {
-											echo $StatusName;
-										}
-									} else {
-										echo "Status not provided";
-									}
-									?>
-								</div>
-							</div>
+									<!--/. f o o t e r  b u t t o n -->
 
 						</div> <!-- end card body-->
 					</div> <!-- end card -->
@@ -4611,7 +4619,6 @@ if (!empty($getlogpodtl)) {
 
 		tinyMCE.triggerSave();
 		if (validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck()) {
-			//alert('inside Add');
 			var CostCode = $("#EditCostCenter").val();
 			var AvilBudget = $('#EditAvlBudAmt').val();
 			var editMaterialCode = $("#EditMaterialCode").val();
@@ -6001,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 29bbd089..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(
@@ -1147,7 +1159,7 @@ foreach ($PaymentTerms as $TER) {
 														</td>
 														<td style="text-align:right !important"><?php echo $record->Quantity ?></td>
 														<td><?php echo $record->UOM ?></td>
-														<td style="text-align:right !important"><?php echo $record->Rate ?></td>
+														<td style="text-align:right !important"><?php echo number_format($record->Rate, 2); ?></td>
 														<td style="text-align:right !important"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
 														<td style="text-align:right !important"><?php echo $record->Taxamount ?></td>
 														<td style="text-align:right !important"><?php echo $record->TotalValue ?></td>
@@ -1353,66 +1365,51 @@ foreach ($PaymentTerms as $TER) {
 							</div>
 							<br>
 							
-							<!-- 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 />
-
+                            <!-- 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) { 
+												$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
+												if (file_exists($PrePOFilePath)) {
+											?>
+											<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>
-
+											<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 } ?>
-                            <!-- ends here -->
-
-							<!-- for Button -->
-							<div class="form-row">
-								<div class="form-group col-md-12" align="right"><br>
-									<div class="btn-container" style="text-align: right;">
-
+									  </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="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 										<input type="hidden" name="txtStatus" id="txtStatus" />
 										<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-
-
-										<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>
 									</div>
-								</div>
-							</div>
-							<!-- ends Button -->
-							<br>
-							<!-- for Start -->
-							<div class="form-row">
-								
-								<div class="form-group col-md-3">
-									<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
-									$Reqon = $Reqon->format('d-m-Y'); ?>
-									<label>Request On :</label><?php echo $Reqon; ?><br />
-									<label>Request By :</label><?php echo $RequesterName; ?><br />
-									<label>Status : </label><?php
+									<!--/.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">
+												<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
+												      $Reqon = $Reqon->format('d-m-Y'); ?>
+													<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',
@@ -1430,13 +1427,17 @@ foreach ($PaymentTerms as $TER) {
 																echo "Status not provided";
 															}
 															?>
+											</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>
+								            </div>
+								        </div>
 
-								</div>
-
-							</div>
-							<!-- ends Button -->
-
+									</div>
+									<!--/. f o o t e r  b u t t o n -->
 						</div>
 					</div>
 				</div>
@@ -1738,7 +1739,7 @@ foreach ($PaymentTerms as $TER) {
 									</div>
 									<div class="form-row px-3">
 										<div class="form-group col-md-12">
-											<label>Service Description </label>
+											<label>Service Description <span class="text-danger">*</span></label>
 											<?php $data = array(
 												'name' => 'EdittxtSpcialInstruction',
 												'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription),
@@ -1883,7 +1884,9 @@ foreach ($PaymentTerms as $TER) {
 			$('#EditAmendPer').val($('#per' + userid).val());
 			$('#EditQuantity').val($('#quantity' + userid).val());
 			RequistQuantity = $('#quantity' + userid).val();
-			$('#EditRate').val($('#itemRate' + userid).val());
+			RateValue = $('#itemRate' + userid).val(); 
+			RateValue = parseFloat(RateValue).toFixed(2);
+			$('#EditRate').val(RateValue);
 			$('#txtEditBasicValue').val(cellval[8].innerHTML);
 			$('#EditCgst').val($('#Cgst' + userid).val());
 			$('#EditSgst').val($('#Sgst' + userid).val());
@@ -2330,6 +2333,10 @@ foreach ($PaymentTerms as $TER) {
 		else if (ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val()) == false) {
 			$('#EditRate').focus();
 			return false;
+		} else if ($('#EdittxtSpcialInstruction').val() == '') {
+			alert('Please Enter the Service Description');
+			$('#EdittxtSpcialInstruction').focus();
+			return false;
 		} else {
 			return true;
 		}
@@ -2493,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/publicholidays.php b/app/Views/publicholidays.php
index 7dcc8b83..117e9d85 100755
--- a/app/Views/publicholidays.php
+++ b/app/Views/publicholidays.php
@@ -31,15 +31,15 @@
             <div class="card">
               <div class="row" style="padding: 18px 26px;">
                 <div class="col-md-3">
-                  <span>Holiday Name : </span>
+                  <label>Holiday Name : </label>
                   <input type="text" name="hname" id="hname" class="form-control">
                 </div>
                 <div class="col-md-3">
-                  <span>Date : </span>
+                  <label>Date : </label>
                   <input type="text" name="hdate" id="hdate" class="form-control">
                 </div>
                 <div class="col-md-3">
-                  <input type="button" id="Add" value="Add" class="btn btn-success" class="form-control" style="margin-top: 20px;margin-bottom: 0px;">
+                  <input type="button" id="Add" value="Add" class="btn btn-success" class="form-control" style="margin-top: 25px;margin-bottom: 0px;">
                 </div>
               </div>
               <div class="card-body">
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index b61334fd..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,35 +2302,38 @@ if (!empty($INRSYMBOL)) {
 							</div>
 
 
-							<label>Select Purchase Order File</label>
-							<div class="form-row">
-								
-								<div class="form-group col-md-12">
-								
-								<input type="file" name="POFile" id="POFile"><br>
-								</div>
-						    
-
-							</div>
-
-							<div class="form-row">
-								<div class="form-group col-md-12">
-									<div align="right" style="padding-right:10px">
-										
+									<!-- 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>
+									<!-- /. 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 class="btn-container" style="text-align: right;">
-											<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</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>
+									<!--/.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="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>
 										</div>
 									</div>
-								</div><br />
-							</div>
+									<!--/. f o o t e r  b u t t o n -->
+
 						</div> <!-- end card body-->
 					</div> <!-- end card -->
 				</div><!-- end col-->
@@ -3290,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());
@@ -3482,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>
@@ -3513,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);
@@ -3549,7 +3563,6 @@ if (!empty($INRSYMBOL)) {
 	$('.EditRevenue').click(function() {
 		tinyMCE.triggerSave();
 		if (validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck()) {
-			// alert('inside Add');			
 			var CostCode = $("#EditCostCenter").val();
 			var AvilBudget = $('#EditAvlBudAmt').val();
 			var editMaterialCode = $("#EditMaterialCode").val();
@@ -3557,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();
@@ -3606,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/rawmaterialListing.php b/app/Views/rawmaterialListing.php
index bd30793f..10b57846 100755
--- a/app/Views/rawmaterialListing.php
+++ b/app/Views/rawmaterialListing.php
@@ -235,7 +235,7 @@
 
 <!-- Long Content Scroll Modal -->
 <div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog" aria-labelledby="scrollableModalTitle" aria-hidden="true" style="max-width: 100%;">
-    <div class="modal-dialog modal-dialog-scrollable" role="document" style="max-width: 50%;">
+    <div class="modal-dialog modal-dialog-scrollable modal-lg" role="document" style="max-width: 65%;">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="scrollableModalTitle">Material Details</h5>
@@ -312,7 +312,7 @@ $(document).ready(function () {
                                     <th style="text-align: center;" >PONO</th>
                                     <th style="text-align: center;" >PO Type</th>
                                     <th style="text-align: center;" >Total Value</th>
-                                   
+                                    <th style="text-align: center;" >Action</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -321,6 +321,9 @@ $(document).ready(function () {
                     result.forEach(item => {
                         CreatedDate = formatDate(item.CreatedDate);
                         TotalOrderValue = formatNumberToIndianCurrency(item.TotalOrderValue);
+                        baseUrl = "<?php echo base_url() ?>";
+                        href = `${baseUrl}purchaseorder/CreatePOPrint?PONO=${item.PONO}&ReqType=${item.ReqType}`;
+
                         tableHtml += `
                             <tr>
                                 <td>${CreatedDate}</td>
@@ -328,9 +331,14 @@ $(document).ready(function () {
                                 <td class="pono-cell" data-pono="${item.PONO}" data-potype="${item.POType}" data-capitalrange="${item.CapitalRange}" style="cursor: pointer; color: #4d3a6d;">
                                     ${item.PONO}
                                 </td>
-                                 <td style="text-align: right;">${item.POType}</td>
+                                <td style="text-align: right;">${item.POType}</td>
                                 <td style="text-align: right;">${TotalOrderValue}</td>
-                            </tr>
+                                <td style="text-align: center;">
+                                  <a data-toggle="tooltip" href=${href} target="_blank">
+                                    <i class="fa fa-print" data-toggle="tooltip" title="${item.PONO} -  Click here to Print the Purchase Order details"></i>
+                                  </a>
+                                </td>
+                             </tr>
                         `;
                     });
 
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/requisitionlisting.php b/app/Views/requisitionlisting.php
index 2971264f..8cc36bac 100755
--- a/app/Views/requisitionlisting.php
+++ b/app/Views/requisitionlisting.php
@@ -144,10 +144,10 @@ if (!empty($Status)) {
                                             <th class="th">Requisted Date</th>
                                             <th class="th">Requisition No</th>
                                             <th class="th">Requisition Type</th>
-                                            <th class="th">Tot No.OfLineItem </th>
-                                            <th class="th">Po CreatedLineItem</th>
-                                            <th class="th">Partially PoCreatedLineItem</th>
-                                            <th class="th">NewLine Item</th>
+                                            <th class="th">Total Line Items</th>
+                                            <th class="th">PO Created</th>
+                                            <th class="th">Partial PO </th>
+                                            <th class="th">New</th>
                                             <th class="th">Status</th>
                                             <th class="th">Action</th>
                                         </tr>
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php
index c76b0563..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() {
@@ -672,7 +683,6 @@ if (!empty($INRSYMBOL)) {
 			console.log("2222222222222222");
 
 			if (validateEditServiceTax()) {
-				alert('inside Add');
 				var CostCode = $("#EditCostCenter").val();
 				var AvilBudget = $('#EditAvlBudAmt').val();
 				var editMaterialCode = $("#EditMaterialCode").val();
@@ -1153,34 +1163,38 @@ if (!empty($INRSYMBOL)) {
 
 							<br>
 
-							<div class="form-row">
-								<div class="form-group col-md-12">
-									<label for="POFile">Select Purchase Order File</label>
-								<input type="file" class="d-block" name="POFile" id="POFile"><br>
-								</div>
-							</div>
-							
-							
-							<div class="form-row">
-								<div class="form-group col-md-12">
-									<br />
-									<div align="right" style="padding-right:10px">
-										
+									<!-- 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 for="POFile">Select Purchase Order File</label>
+												<input type="file" class="d-block" name="POFile" id="POFile"><br>
+											</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="txtStatus" id="txtStatus" />
 										<input type="hidden" name="txtRowCount" id="txtRowCount" />
 										<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
 										<input type="hidden" name="SpcialInstruction" id="SpcialInstruction">
 										<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress">
 										<input type="hidden" name="Budget" id="Budget" />
-										<div class="btn-container" style="text-align: right;">
-
-											<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>
-										</div><!-- 7.4 btn-container  div closed here -->
-									</div><br /><!-- 7.4 right  div closed here -->
-								</div><!-- 7.4 row  div closed here -->
-							</div><!-- 11 form-row  div closed here -->
+									</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-->
@@ -1465,9 +1479,7 @@ if (!empty($INRSYMBOL)) {
 
 						<div class="form-row">
 							<div class="form-group col-md-12">
-								<label>Service Description </label>
-
-
+								<label>Service Description <span class="text-danger">*</span></label>
 								<?php
 								$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
 								echo form_textarea($data); ?>
@@ -1747,7 +1759,7 @@ if (!empty($INRSYMBOL)) {
 
 							<div class="form-row">
 								<div class="form-group col-md-12">
-									<label>Service Description </label>
+									<label>Service Description <span class="text-danger">*</span></label>
 									<?php
 									$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
 									echo form_textarea($data); ?>
@@ -1901,7 +1913,6 @@ if (!empty($INRSYMBOL)) {
 
 		tinyMCE.triggerSave();
 		if (validateServiceTax()) {
-			// alert('inside Addservice');
 			var temp = index;
 			var Reqnumber = $('#ReqNo').val();
 			var departmentName = $('#deptName').val();
@@ -2291,6 +2302,10 @@ if (!empty($INRSYMBOL)) {
 		} else if (ExceedBudget($('#txtBasicValue').val(), $('#AvlBudAmt').val()) == false) {
 			$('#Rate').focus();
 			return false;
+		} else if ($('#txtSpcialInstruction').val() == '') {
+			alert('Please Enter the Service Description');
+			$('#txtSpcialInstruction').focus();
+			return false;
 		} else {
 			return true;
 		}
@@ -2328,6 +2343,10 @@ if (!empty($INRSYMBOL)) {
 		} else if (ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val()) == false) {
 			$('#EditRate').focus();
 			return false;
+		} else if ($('#EdittxtSpcialInstruction').val() == '') {
+			alert('Please Enter the Service Description');
+			$('#EdittxtSpcialInstruction').focus();
+			return false;
 		} else {
 			return true;
 		}
@@ -2399,7 +2418,6 @@ if (!empty($INRSYMBOL)) {
 			} else {
 				var formData = new FormData($('.ServicePO')[0]);
 				$('#loader').show();
-				console.log("inside add service purchase order view page");
 
 				console.log(formData);
 
diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php
index 337fac08..c87d78e7 100755
--- a/app/Views/viewinwardgateregister.php
+++ b/app/Views/viewinwardgateregister.php
@@ -529,7 +529,7 @@
 						<label> Master IGR file</label>
 						<br>
 						<input  type="file" name="MasterFile" id="MasterFile" onchange="filenames(this.name); ">
-						<label id="MasterFileLabel" style="display:none;">
+						<label id="MasterFileLabel" style="display:none;" class="mt-1">
 							<a><span></span><small></small></a>
 						</label>
 					</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'){