diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index e1174010..2d1f6c3a 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -512,7 +512,7 @@ if (!empty($INRSYMBOL)) {
         selValue = $("#drpFreight").val();
         if (selValue == PercentageType) {
             var freightCalculation = '';
-          //  $('#REVENUE').modal('hide');
+         
             $('#freightmodel').modal('show');
             $('#txtFreight').removeAttr('readonly', 'true');
         } else if (selValue == NilType) {
@@ -4816,7 +4816,7 @@ if (!empty($INRSYMBOL)) {
                                     <div class="row">
                                           <div class="col-md-4 mt-2 "><strong>Vehicle No</strong>
                                                 <input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="" required>
-                                            </div>
+                                    </div>
 
                                         <div class="col-md-4  mt-2 "><strong>Courier No</strong>
                                             <input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="" required>
@@ -6209,7 +6209,10 @@ if (!empty($INRSYMBOL)) {
             // Initialize the DataTable
           
 
-            Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
+            Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}", {
+                placeholder: '' 
+            }).mask($("#VehicleNo"));
+
 
 
             // $("#ChallanInvDate").datepicker({
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index 7ac0530c..e4c39dd7 100755
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -130,6 +130,10 @@ if (!empty($INRSYMBOL)) {
 ?>
 <!-- Latest compiled and minified CSS -->
 
+<style>
+	.modal { overflow: auto !important; }
+</style>
+
 <script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
 
 <script type="text/javascript">
@@ -323,27 +327,23 @@ if (!empty($INRSYMBOL)) {
 
 			if (FreightType == "PER TRIP") {
 				$('#EditTripsValue').show();
-				$(this).parent().removeClass('col-md-3').addClass('col-md-2');
-				$('#EditNOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
-				$('#txtEditFreight').parent().removeClass('col-md-3').addClass('col-md-2');
-				$('#txtEditAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
+				
 			} else {
 				$('#EditTripsValue').hide();
-				$(this).parent().removeClass('col-md-2').addClass('col-md-3');
-				$('#EditNOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
-				$('#txtEditFreight').parent().removeClass('col-md-2').addClass('col-md-3');
-				$('#txtEditAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
+				
 			}
 			selValue = $("#drpEditFreight").val();
 			$('#txtEditFreight').val('');
 			$('#txtEditAfterFreight').val('');
 			if (selValue == PercentageType) {
 				var PackagingCalculation = '';
-				// $('#freightmodel').modal('show');
-				$('#EDITREVENUE').modal('hide');
-				setTimeout(() => {
+
 					$('#freightmodel').modal('show');
-				}, 1000);
+					$('#freightmodel').modal({
+					backdrop: true, 
+					keyboard: true  
+					});
+				
 
 				$('#txtEditFreight').removeAttr('readonly', 'true');
 			} else if (selValue == NilType) {
@@ -745,9 +745,7 @@ if (!empty($INRSYMBOL)) {
 		FreightCalculation = $("input:radio[name='optfreight']:checked").val();
 		// alert("this is value taken as before after radio value"+FreightCalculation);
 		$('#freightmodel').modal('hide');
-		setTimeout(() => {
-			$('#EDITREVENUE').modal('show');
-		}, 1000);
+		
 		// $('#EDITREVENUE').modal('show');
 		calculateFreight();
 	}
@@ -1510,14 +1508,16 @@ if (!empty($INRSYMBOL)) {
 					<div class="radio">
 						<label><input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount</label>
 					</div>
+					<br>
 					<div class="radio">
 						<label><input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount</label>
 					</div>
 				</form>
 			</div>
 			<div class="modal-footer">
-				<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-				<a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+				<a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
+				&nbsp;&nbsp;
+				<a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" >&nbsp;&nbsp;<span class="bold">Ok</span></a>
 			</div>
 		</div>
 	</div>
@@ -1551,7 +1551,7 @@ if (!empty($INRSYMBOL)) {
 </div><!-- /.modal -->
 <div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-full-width">
+	<div class="modal-dialog modal-full-width" style="width:1060px !important ;" >
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
@@ -1605,7 +1605,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="form-row">
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>Item Code<span class="text-danger">*</span></label>
 								<div>
 									<?php
@@ -1620,7 +1620,7 @@ if (!empty($INRSYMBOL)) {
 								</div>
 							</div>
 
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>Item Name</label>
 								<div>
 									<?php
@@ -1629,7 +1629,7 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>UOM</label>
 								<div>
 									<?php
@@ -1638,9 +1638,7 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-6">
-								<div class="form-row">
-									<div class="form-group col-md-3">
+							<div class="form-group col-md-3">
 										<label>Quantity<span class="text-danger">*</span></label>
 										<div>
 											<?php
@@ -1650,6 +1648,13 @@ if (!empty($INRSYMBOL)) {
 
 										</div>
 									</div>
+							
+						</div>
+
+						<div class="form-row">
+
+						            <div class="form-group col-md-3"></div>
+								
 									<div class="form-group col-md-3">
 										<label>Rate <?php echo "($INRSYM)" ?><span class="text-danger">*</span></label>
 										<div>
@@ -1673,13 +1678,12 @@ if (!empty($INRSYMBOL)) {
 											?>
 										</div>
 									</div>
-								</div>
-							</div>
 						</div>
 
+					
 						<div class="form-row">
-							<div class="form-group col-md-4"></div>
-							<div class="form-group col-md-4">
+							<div class="form-group col-md-3"></div>
+							<div class="form-group col-md-3">
 								<label>Discount Type </label>
 
 								<?php
@@ -1699,7 +1703,7 @@ if (!empty($INRSYMBOL)) {
 
 								?>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>Discount Rate </label>
 
 								<?php
@@ -1708,7 +1712,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
 
 								<?php
@@ -1718,9 +1722,10 @@ if (!empty($INRSYMBOL)) {
 
 							</div>
 						</div>
+
 						<div class="form-row">
-							<div class="form-group col-md-4"></div>
-							<div class="form-group col-md-4">
+							<div class="form-group col-md-3"></div>
+							<div class="form-group col-md-3">
 								<label>Freight Type </label>
 								<?php
 								$options = array("0" => 'Select Freight Type');
@@ -1732,21 +1737,14 @@ if (!empty($INRSYMBOL)) {
 								echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control "');
 								?>
 							</div>
-							<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
-								<label>NO Of Trips</label>
-								<?php
-								$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight();');
-								echo form_input($data);
-								?>
-							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>Freight Rate </label>
 								<?php
 								$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight();', 'style' => 'text-align:right;');
 								echo form_input($data);
 								?>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>Freight Amt <?php echo "($INRSYM)" ?></label>
 								<?php
 								$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
@@ -1754,9 +1752,21 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
+
+						<div class="form-row">
+							<div class="form-group col-md-9"></div>
+						    <div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
+								<label>NO Of Trips</label>
+								<?php
+								$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight();');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+
 						<div class="form-row" style="text-align:left;">
-							<div class="form-group col-md-4"></div>
-							<div class="form-group col-md-4">
+							<div class="form-group col-md-3"></div>
+							<div class="form-group col-md-3">
 								<label>Packaging Type </label>
 								<div>
 									<?php
@@ -1777,7 +1787,7 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>Packaging Rate </label>
 								<div>
 									<?php
@@ -1786,7 +1796,7 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
 								<?php
 								$data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
@@ -1796,8 +1806,8 @@ if (!empty($INRSYMBOL)) {
 						</div>
 
 						<div class="form-row" id="CGSTArea">
-							<div class="form-group col-md-8"> </div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-6"> </div>
+							<div class="form-group col-md-3">
 								<label>CGST in %</label>
 
 								<?php
@@ -1805,7 +1815,7 @@ if (!empty($INRSYMBOL)) {
 								echo form_input($data);
 								?>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>CGST Amt <?php echo "($INRSYM)" ?></label>
 								<?php
 								$data = array('name' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
@@ -1814,8 +1824,8 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="form-row" id="SGSTModel">
-							<div class="form-group col-md-8"></div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-6"></div>
+							<div class="form-group col-md-3">
 								<label>SGST in %</label>
 
 								<?php
@@ -1823,7 +1833,7 @@ if (!empty($INRSYMBOL)) {
 								echo form_input($data);
 								?>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>SGST Amt <?php echo "($INRSYM)" ?></label>
 								<?php
 								$data = array('name' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat',  'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;');
@@ -1832,8 +1842,8 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="form-row" id="IGSTModel" style="display:none;">
-							<div class="form-group col-md-8"></div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-6"></div>
+							<div class="form-group col-md-3">
 								<label>IGST in %</label>
 								<div>
 									<?php
@@ -1842,7 +1852,7 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>IGST Amt <?php echo "($INRSYM)" ?></label>
 								<div>
 									<?php
@@ -1856,8 +1866,8 @@ if (!empty($INRSYMBOL)) {
 
 						</div>
 						<div class="form-row">
-							<div class="form-group col-md-8"></div>
-							<div class="form-group col-md-4">
+							<div class="form-group col-md-9"></div>
+							<div class="form-group col-md-3">
 								<label> Insurance Amt <?php echo "($INRSYM)" ?>(if Any)</label>
 								<div>
 									<?php
@@ -1868,7 +1878,8 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="form-row">
-							<div class="form-group col-md-12">
+							<div class="form-group col-md-9"></div>
+							<div class="form-group col-md-3">
 								<label>Total Order Amt <?php echo "($INRSYM)" ?></label>
 								<?php
 								$data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
@@ -1897,7 +1908,7 @@ if (!empty($INRSYMBOL)) {
 		</div>
 	</div>
 </div><!-- /.modal -->
-<div id="freightmodel" class="modal fade" tabindex="-1" role="dialog"
+<div id="freightmodel" data-backdrop-limit="1" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
 	<div class="modal-dialog modal-lg">
 		<div class="modal-content">
@@ -1918,8 +1929,8 @@ if (!empty($INRSYMBOL)) {
 				</form>
 			</div>
 			<div class="modal-footer">
-				<a class="btn btn-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-				<a class="btn btn-info waves-effect waves-light" ID="PackagingOption" onclick="SetFreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+				<a class="btn btn-secondary waves-effect" data-dismiss="modal"  value="Cancel">Cancel</a>
+				<a class="btn btn-info waves-effect waves-light" ID="PackagingOption" onclick="SetFreightOption();" >&nbsp;&nbsp;<span class="bold">Ok</span></a>
 			</div>
 		</div>
 	</div>
@@ -2486,4 +2497,46 @@ if (!empty($INRSYMBOL)) {
 		}
 
 	});
+</script>
+
+
+
+<script>
+        $(document).ready(function() {
+        // When the second modal is about to be shown
+        $('#packagingcalmodel').on('show.bs.modal', function () {
+            // Set a higher z-index for the second modal to appear on top
+            $('#packagingcalmodel').css('z-index', 1060);  // Set the z-index for the second modal
+            // Ensure the second modal backdrop appears above the first one
+            setTimeout(function() {
+                $('.modal-backdrop').last().css('z-index', 1055);
+            }, 0);
+        });
+
+        // Reset z-index when the second modal is hidden (optional)
+        $('#packagingcalmodel').on('hidden.bs.modal', function () {
+            $('#packagingcalmodel').css('z-index', '');  // Reset to default
+        });
+    });
+
+</script>
+
+<script>
+    $(document).ready(function() {
+    // When the second modal is about to be shown
+        $('#freightmodel').on('show.bs.modal', function () {
+            // Set a higher z-index for the second modal to appear on top
+            $('#freightmodel').css('z-index', 1060);  // Set the z-index for the second modal
+            // Ensure the second modal backdrop appears above the first one
+            setTimeout(function() {
+                $('.modal-backdrop').last().css('z-index', 1055);
+            }, 0);
+        });
+
+        // Reset z-index when the second modal is hidden (optional)
+        $('#freightmodel').on('hidden.bs.modal', function () {
+            $('#freightmodel').css('z-index', '');  // Reset to default
+        });
+    });
+
 </script>
\ No newline at end of file
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index 57c18e78..590de36b 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -969,9 +969,10 @@ if (!empty($getlogpodtl)) {
 
                             <br><br>
 
-                            <div class="form-row">
+                        
 
                                 <div class="form-row">
+
                                     <div class="form-group col-md-4">
                                         <label>Total Landing Charge <?php echo "($INR)" ?></label>
 
@@ -1075,10 +1076,11 @@ if (!empty($getlogpodtl)) {
 
                                     <!-- <input type="text" name="txttot" id="txtPONO"  value=<?php echo "$totalhidden"; ?>>  -->
                                 </div>
+
                                 <input type="hidden" name="txttot" id="txttot" value=<?php echo $totalhidden ?>>
 
                                 <!--##################################################################   -->
-                                <?php if (!empty($update)) { ?>
+                                <?php if (!empty($update)){ ?>
                                     <div class="form-row" id="editpodiv">
                                         <div class="form-group col-md-12"><label>Editable POScreen</label>
                                             <table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
@@ -1147,26 +1149,28 @@ if (!empty($getlogpodtl)) {
                                                     }
                                                     ?>
                                                 </tbody>
-                                            <?php } else {
-                                        } ?>
                                             </table>
                                         </div>
                                     </div>
 
+                                <?php } ?>
+                                           
 
-                                    <div class="form-row p-4">
+                                <div class="form-row ">
                                         <div class="form-group col-md-12">
-                                            <label>Special Instructions </label> <?php
-                                                                                    $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-                                                                                    echo form_textarea($data);
-                                                                                    ?>
+                                            <label>Special Instructions </label> 
+                                            <?php
+                                                $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+                                                echo form_textarea($data);
+                                            ?>
                                         </div>
                                     </div>
 
+                                </div>
+                            
 
-                                    
 
-                                    <div class="form-row px-4">
+                            <div class="form-row px-4">
                                       <label>Select Purchase Order File</label>
                                             <div class="form-group col-md-12" align="left">  
                                             
@@ -1174,103 +1178,96 @@ if (!empty($getlogpodtl)) {
                                                                                                     
                                             </div>
                                         
-                                    </div>
+                            </div>
 
-                                    <div class="form-row px-4">
-                                        <div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
-                                            <div> 
-                                                <?php if ($PrePOFile) { ?>
-                                                    <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previously Uploaded Purchase Order File- </span><small><?= $PrePOFile; ?></small></a></label>
-                                                    &nbsp;&nbsp;&nbsp;&nbsp;
-                                                    <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
+                            <div class="form-row px-4">
+                                <div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
+                                    <div> 
+                                        <?php if ($PrePOFile) { ?>
+                                            <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previously Uploaded Purchase Order File- </span><small><?= $PrePOFile; ?></small></a></label>
+                                            &nbsp;&nbsp;&nbsp;&nbsp;
+                                            <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
+                                        <?php } ?>
+                                        <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" />
+                            
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-row px-4 ">
+
+                                <div class="form-group col-md-12">
+
+                                        <div 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="txtRow" id="txtRow" value="<?php echo $index; ?>" />
+                                            <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-success 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 } ?>
-                                                <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" />
-                                    
-                                            </div>
-                                        </div>
-                                    </div>
+                                                <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                <a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
+                                                <!--  <input type="reset" class="btn btn-success" value="Reset"> -->
+                                            <?php } else { ?>
 
-                                    <div class="form-row px-4">
 
-                                    <div class="form-group col-md-12">
+                                                <?php if ($DEPCode == FINANCE) { ?>
+                                                    <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
 
-                                            <div 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="txtRow" id="txtRow" value="<?php echo $index; ?>" />
-                                                <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-success 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 btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
-                                                    <!--  <input type="reset" class="btn btn-success" value="Reset"> -->
                                                 <?php } else { ?>
-
-
-                                                    <?php if ($DEPCode == FINANCE) { ?>
-                                                        <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
-
-                                                    <?php } else { ?>
-                                                        <!-- <input type="reset" class="btn btn-success" value = "OK"> -->
-                                                        <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                                        <a class="btn btn btn-soft-primary waves-effect waves-light 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 } ?>
+                                                    <!-- <input type="reset" class="btn btn-success" value = "OK"> -->
+                                                    <a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                                    <a class="btn btn btn-soft-primary waves-effect waves-light 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-4">
-                                        <div class="form-group col-md-12" align="left" style="padding-right:10px">
-                                            <div class="col-md-5 col-md-offset-7" align="left"><br />
-                                                <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',
-                                                                            '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>
-                                            <br />
                                         </div>
-                                    </div>
-
-
-
-                          
 
+                                </div>
 
                             </div>
 
-                        </div>
+                            <div class="form-row px-4 ">
+                                <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
+                                                                $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";
+                                                                }
+                                                                ?>
+                                   
+                                    <br />
+                                </div>
+                            </div>
+
+