diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php
index 9d6c4b13..fde5b03c 100644
--- a/app/Controllers/Amendmentpurchaseorder.php
+++ b/app/Controllers/Amendmentpurchaseorder.php
@@ -287,8 +287,9 @@ class Amendmentpurchaseorder extends BaseController
     if ($PaymentTerms != 'PT08') {
       $Otherpayment = '';
     }
+    $AmendmentNewPoNo = generate_amendment_po_number($PONO);
 
-    $POMaster = array('ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $PoRange, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult);
+    $POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $PoRange, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult);
     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
     if (count($LastPO) > 0) {
       $NewPO =  $LastPO[0]['PONO'];
@@ -618,7 +619,9 @@ class Amendmentpurchaseorder extends BaseController
     if ($PaymentTerms != 'PT08') {
       $Otherpayment = '';
     }
-    $POMaster = array('ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
+    $AmendmentNewPoNo = generate_amendment_po_number($PONO);
+
+    $POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
 
     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
 
@@ -916,7 +919,9 @@ class Amendmentpurchaseorder extends BaseController
       $Otherpayment = '';
     }
     $updatedBy = $this->session->get('userId');
-    $POMaster = array('ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $FinalTotalOrder, 'POType' => $POType, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'CapitalRange' => $PoRange, 'ExchangeRate' => $ExchangeRate, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'PaymentTerms' => $PaymentMethod, 'PaymentOtherDescription' => $Otherpayment, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CurrencyType' => $currencytypeID, 'AmendedDetails' => $MAD, 'Import_DispatchDetails' => $curdispatch, 'Import_PlaceofOrgin' => $PlaceOforigin, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
+    $AmendmentNewPoNo = generate_amendment_po_number($PONO);
+
+    $POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $FinalTotalOrder, 'POType' => $POType, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'CapitalRange' => $PoRange, 'ExchangeRate' => $ExchangeRate, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'PaymentTerms' => $PaymentMethod, 'PaymentOtherDescription' => $Otherpayment, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CurrencyType' => $currencytypeID, 'AmendedDetails' => $MAD, 'Import_DispatchDetails' => $curdispatch, 'Import_PlaceofOrgin' => $PlaceOforigin, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
 
     foreach ($LastPO as $PO) :
@@ -1288,8 +1293,8 @@ class Amendmentpurchaseorder extends BaseController
 
       $MAD .= $MAD . "Current Place of Origin:&nbsp;&nbsp;" . $beforePalaceoforigin . "<br>";
     }
-
-    $POMaster = array('ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $POStatus, 'PORange' => $PoRange, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'Import_DispatchDetails' => $Dispatch, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ExchangeRate' => $Exchangerate, 'ExchangeRateCalculatedon' => $ExchangeRateCalculatedon, 'CurrencyType' => $CurrencyType, 'PaymentTerms' => $PaymentTerms, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'AmendedDetails' => $MAD, 'PaymentOtherDescription' => $OtherPayment, 'InsuranceStatus' => $insurestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $qtycheckresult);
+    $AmendmentNewPoNo = generate_amendment_po_number($PONO);
+    $POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $POStatus, 'PORange' => $PoRange, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'Import_DispatchDetails' => $Dispatch, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ExchangeRate' => $Exchangerate, 'ExchangeRateCalculatedon' => $ExchangeRateCalculatedon, 'CurrencyType' => $CurrencyType, 'PaymentTerms' => $PaymentTerms, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'AmendedDetails' => $MAD, 'PaymentOtherDescription' => $OtherPayment, 'InsuranceStatus' => $insurestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $qtycheckresult);
     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
     $NewPO = '';
     if (count($LastPO) > 0) {
diff --git a/app/Helpers/purchaseorder_helper.php b/app/Helpers/purchaseorder_helper.php
index 7d56be21..8946e7b5 100755
--- a/app/Helpers/purchaseorder_helper.php
+++ b/app/Helpers/purchaseorder_helper.php
@@ -26,6 +26,24 @@ if (!function_exists('generate_po_number')) {
         return $PoNo;
     }
 }
+
+function generate_amendment_po_number($PoNo, $increment = 1) {
+ if (strpos($PoNo, '.') !== false) {
+   list($base, $decimal) = explode('.', $PoNo);
+   preg_match('/^0*(\d+)$/', $decimal, $matches);
+   $numeric_part = isset($matches[1]) ? $matches[1] : '';
+   $new_numeric_part = intval($numeric_part) + $increment;
+         
+   // Determine the number of leading zeros based on the original numeric part length
+   $new_decimal_length = strlen($numeric_part) > 1 ? strlen($numeric_part) : 2;
+   $new_decimal = str_pad($new_numeric_part, $new_decimal_length, '0', STR_PAD_LEFT);
+         
+   return $base . '.' . $new_decimal;
+ } else {
+    return $PoNo . '.01';
+ }
+}
+
 if (!function_exists('invoice_logo_pdf')) 
 {
     function invoice_logo_pdf()
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index 52dfac49..301e562c 100644
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -2307,8 +2307,10 @@ document.getElementById('dispatchinternational').style.display = 'block';
 		<?php $UpdatedOn=new DateTime($UpdatedOn, new DateTimeZone('Asia/Kolkata'));				
 												$UpdatedOn=$UpdatedOn->format('d-m-Y');?>
 		<label>Request On :</label><?php echo $UpdatedOn;?><br/>
-				<label>Request By :</label><?php echo $requestedBy;?><br/>
-				<label>Status :</label><?php echo $PoStatusName;?>
+        <?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',
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index 57f6b207..29d6d2ac 100644
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -2162,7 +2162,9 @@ function calculateEditTaxValue()
 <?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 $Requestedby;?><br/>
+<?php if ($RequesterName != '' || $RequesterName != null) { ?>
+	<label>Request By : </label><?php echo $RequesterName; ?><br />
+<?php } ?><br/>
 				<label>Status :</label><?php echo $POStatus;?>
  
          </div></div></section>
diff --git a/app/Views/porelease_view.php b/app/Views/porelease_view.php
index 17da9b02..8594fa2b 100644
--- a/app/Views/porelease_view.php
+++ b/app/Views/porelease_view.php
@@ -112,14 +112,16 @@ if(empty($Status))
 	
 						
 						<?php 
-						if($record->StatusName == 'RELEASER ONHOLD' or $record->StatusName == 'AWAITING RELEASE' or $record->StatusName == 'AMENDMENT PO'){
-						?>
+						// if($record->StatusName == 'RELEASER ONHOLD' or $record->StatusName == 'AWAITING RELEASE' or $record->StatusName == 'AMENDMENT PO'){
+					       if($record->StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED  ){					
+							
+						?>						
 						<td>
 					
 					<select name="selectId" id="selectId" onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index ; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');">        				        
     					        <option value="-1" >Select Action</option>
         				        <!-- <option value="1">Release</option> -->
-								<option value="1">Approve</option>
+								<option value="1">Approve And Release</option>
         				        <option value="2">OnHold</option>
 						    </select>
 							</td> 
@@ -192,7 +194,7 @@ if(empty($Status))
 		if(Status != '-1'){
 		if(Status == '1'){
 		// var strMsg='Do you want to Release this Purchase Order?'
-		var strMsg='Do you want to Approve this Purchase Order?'
+		var strMsg='Do you want to Approve and Release this Purchase Order?'
 		var StatusCode='ST026';
          //alert(StatusCode);
 		}